Merge branch 'dev'

app/common/dao/store/shipping/ShippingTemplateDao.php

@@ -86,7 +86,11 @@ class ShippingTemplateDao  extends BaseDao
 
     public function getList($merId)
     {
-        return ($this->getModel())::getDB()->where('mer_id',$merId)->field('shipping_template_id,name')->select();
+//        return ($this->getModel())::getDB()->where('mer_id',$merId)->field('shipping_template_id,name')->select();
+        $list = ($this->getModel())::getDB()->where('mer_id',$merId)->field('shipping_template_id,name')->select()->toArray();
+        $default = ['shipping_template_id' => 105, 'name' => '默认包邮'];//默认
+        $list[] = $default;
+        return $list;
     }
 
     /**

app/common/repositories/store/order/StoreOrderRepository.php

@@ -11313,24 +11313,24 @@ class StoreOrderRepository extends BaseRepository
                     );
 
                     // 如果用户的身份 不是 普通用户 （高于普通用户） 则发放养老金
-                    if ($userEntityBySpreadUid->getUserGroup() != CommonEnum::USER_GROUP['RegularUser']['code']) {
-                        $yanglaojinBySpreadUid = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Spread']['YangLaoJin']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
-                        /** @var UserBillRepository $userBillRepository */
-                        $userBillRepository = app()->make(UserBillRepository::class);
-                        $userBillRepository->addUserBill(
-                            $userEntityBySpreadUid->getUid(),
-                            UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
-                            UserBillEnum::PM['INCOME']['code'],
-                            $yanglaojinBySpreadUid,
-                            UserBillEnum::CATEGORY['NowMoney']['code'],
-                            UserBillEnum::TYPE['Commission']['code'],
-                            UserBillEnum::SOURCE['ONLINE']['code'],
-                            UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
-                            UserBillEnum::TYPE_SHOP['Platform']['code'],
-                            $storeOrderEntity->getOrderId(),
-                            '推广精彩生活区商品获得养老金'
-                        );
-                    }
+                    // if ($userEntityBySpreadUid->getUserGroup() != CommonEnum::USER_GROUP['RegularUser']['code']) {
+                    //     $yanglaojinBySpreadUid = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Spread']['YangLaoJin']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                    //     /** @var UserBillRepository $userBillRepository */
+                    //     $userBillRepository = app()->make(UserBillRepository::class);
+                    //     $userBillRepository->addUserBill(
+                    //         $userEntityBySpreadUid->getUid(),
+                    //         UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
+                    //         UserBillEnum::PM['INCOME']['code'],
+                    //         $yanglaojinBySpreadUid,
+                    //         UserBillEnum::CATEGORY['NowMoney']['code'],
+                    //         UserBillEnum::TYPE['Commission']['code'],
+                    //         UserBillEnum::SOURCE['ONLINE']['code'],
+                    //         UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
+                    //         UserBillEnum::TYPE_SHOP['Platform']['code'],
+                    //         $storeOrderEntity->getOrderId(),
+                    //         '推广精彩生活区商品获得养老金'
+                    //     );
+                    // }
                 }
             }
 
@@ -11558,24 +11558,24 @@ class StoreOrderRepository extends BaseRepository
                         );
 
                         // 如果用户的身份 不是 普通用户 （高于普通用户） 则发放养老金
-                        if ($userEntityBySpreadUid->getUserGroup() != CommonEnum::USER_GROUP['RegularUser']['code']) {
-                            $yanglaojinBySpreadUid = bcmul($basePrice, CommonEnum::ORDER_EARNING_ALLOCATION['MemberZone']['Spread']['YangLaoJin']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
-                            /** @var UserBillRepository $userBillRepository */
-                            $userBillRepository = app()->make(UserBillRepository::class);
-                            $userBillRepository->addUserBill(
-                                $userEntityBySpreadUid->getUid(),
-                                UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
-                                UserBillEnum::PM['INCOME']['code'],
-                                $yanglaojinBySpreadUid,
-                                UserBillEnum::CATEGORY['NowMoney']['code'],
-                                UserBillEnum::TYPE['Commission']['code'],
-                                UserBillEnum::SOURCE['ONLINE']['code'],
-                                UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
-                                UserBillEnum::TYPE_SHOP['Platform']['code'],
-                                $storeOrderEntity->getOrderId(),
-                                '推广会员专区商品获得养老金'
-                            );
-                        }
+                        // if ($userEntityBySpreadUid->getUserGroup() != CommonEnum::USER_GROUP['RegularUser']['code']) {
+                        //     $yanglaojinBySpreadUid = bcmul($basePrice, CommonEnum::ORDER_EARNING_ALLOCATION['MemberZone']['Spread']['YangLaoJin']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                        //     /** @var UserBillRepository $userBillRepository */
+                        //     $userBillRepository = app()->make(UserBillRepository::class);
+                        //     $userBillRepository->addUserBill(
+                        //         $userEntityBySpreadUid->getUid(),
+                        //         UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
+                        //         UserBillEnum::PM['INCOME']['code'],
+                        //         $yanglaojinBySpreadUid,
+                        //         UserBillEnum::CATEGORY['NowMoney']['code'],
+                        //         UserBillEnum::TYPE['Commission']['code'],
+                        //         UserBillEnum::SOURCE['ONLINE']['code'],
+                        //         UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
+                        //         UserBillEnum::TYPE_SHOP['Platform']['code'],
+                        //         $storeOrderEntity->getOrderId(),
+                        //         '推广会员专区商品获得养老金'
+                        //     );
+                        // }
                     }
                 }
             }
@@ -11738,22 +11738,22 @@ class StoreOrderRepository extends BaseRepository
                 $sharedProsperityUserEntityByParent = $sharedProsperityUserRepository->getSharedProsperityUserEntityByUserId($sharedProsperityUserEntity->getParentId());
                 if (!empty($sharedProsperityUserEntityByParent->getId())) {
                     // 为 共富体系推荐人 发放养老金
-                    $yanglaojinBySpreadUid = bcmul($storeOrderEntity->getTotalPrice(), CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Spread']['YangLaoJin']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
-                    /** @var UserBillRepository $userBillRepository */
-                    $userBillRepository = app()->make(UserBillRepository::class);
-                    $userBillRepository->addUserBill(
-                        $sharedProsperityUserEntityByParent->getUserId(),
-                        UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
-                        UserBillEnum::PM['INCOME']['code'],
-                        $yanglaojinBySpreadUid,
-                        UserBillEnum::CATEGORY['NowMoney']['code'],
-                        UserBillEnum::TYPE['Commission']['code'],
-                        UserBillEnum::SOURCE['ONLINE']['code'],
-                        UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
-                        UserBillEnum::TYPE_SHOP['Platform']['code'],
-                        $storeOrderEntity->getOrderId(),
-                        '推广共富区会员消费获得养老金'
-                    );
+                    // $yanglaojinBySpreadUid = bcmul($storeOrderEntity->getTotalPrice(), CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Spread']['YangLaoJin']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                    // /** @var UserBillRepository $userBillRepository */
+                    // $userBillRepository = app()->make(UserBillRepository::class);
+                    // $userBillRepository->addUserBill(
+                    //     $sharedProsperityUserEntityByParent->getUserId(),
+                    //     UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
+                    //     UserBillEnum::PM['INCOME']['code'],
+                    //     $yanglaojinBySpreadUid,
+                    //     UserBillEnum::CATEGORY['NowMoney']['code'],
+                    //     UserBillEnum::TYPE['Commission']['code'],
+                    //     UserBillEnum::SOURCE['ONLINE']['code'],
+                    //     UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
+                    //     UserBillEnum::TYPE_SHOP['Platform']['code'],
+                    //     $storeOrderEntity->getOrderId(),
+                    //     '推广共富区会员消费获得养老金'
+                    // );
 
                     // 发放消费股
                     $consumerStocksBySpread = bcmul($storeOrderEntity->getTotalPrice(), CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Spread']['ConsumerStocks']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
@@ -11975,24 +11975,24 @@ class StoreOrderRepository extends BaseRepository
                     );
 
                     // 如果用户的身份 不是 普通用户 （高于普通用户） 则发放养老金
-                    if ($userEntityBySpreadUid->getUserGroup() != CommonEnum::USER_GROUP['RegularUser']['code']) {
-                        $yanglaojinBySpreadUid = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['CommercialDistrict']['Spread']['YangLaoJin']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
-                        /** @var UserBillRepository $userBillRepository */
-                        $userBillRepository = app()->make(UserBillRepository::class);
-                        $userBillRepository->addUserBill(
-                            $userEntityBySpreadUid->getUid(),
-                            UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
-                            UserBillEnum::PM['INCOME']['code'],
-                            $yanglaojinBySpreadUid,
-                            UserBillEnum::CATEGORY['NowMoney']['code'],
-                            UserBillEnum::TYPE['Commission']['code'],
-                            UserBillEnum::SOURCE['ONLINE']['code'],
-                            UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
-                            UserBillEnum::TYPE_SHOP['Platform']['code'],
-                            $storeOrderEntity->getOrderId(),
-                            '推广商贸区商品获得养老金'
-                        );
-                    }
+                    // if ($userEntityBySpreadUid->getUserGroup() != CommonEnum::USER_GROUP['RegularUser']['code']) {
+                    //     $yanglaojinBySpreadUid = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['CommercialDistrict']['Spread']['YangLaoJin']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                    //     /** @var UserBillRepository $userBillRepository */
+                    //     $userBillRepository = app()->make(UserBillRepository::class);
+                    //     $userBillRepository->addUserBill(
+                    //         $userEntityBySpreadUid->getUid(),
+                    //         UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
+                    //         UserBillEnum::PM['INCOME']['code'],
+                    //         $yanglaojinBySpreadUid,
+                    //         UserBillEnum::CATEGORY['NowMoney']['code'],
+                    //         UserBillEnum::TYPE['Commission']['code'],
+                    //         UserBillEnum::SOURCE['ONLINE']['code'],
+                    //         UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
+                    //         UserBillEnum::TYPE_SHOP['Platform']['code'],
+                    //         $storeOrderEntity->getOrderId(),
+                    //         '推广商贸区商品获得养老金'
+                    //     );
+                    // }
                 }
             }
 

app/controller/merchant/store/shipping/ShippingTemplate.php

@@ -47,9 +47,8 @@ class ShippingTemplate extends BaseController
      */
     public function getList()
     {
-//        return app('json')->success($this->repository->getList($this->request->merId()));
-        // 目前只包邮
-        return app('json')->success($this->repository->getList(0));
+        return app('json')->success($this->repository->getList($this->request->merId()));
+//        return app('json')->success($this->repository->getList(0));  取消硬编码
     }
 
     /**