优化用户下单方法-进行中

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

@@ -52,6 +52,8 @@ use app\controller\api\user\Volunteer;
 use app\entity\data\merchant\MerchantEntity;
 use app\entity\data\product\ShareEntity;
 use app\entity\data\store\CartEntity;
+use app\entity\data\store\StoreGroupOrderEntity;
+use app\entity\data\store\StoreOrderEntity;
 use app\entity\data\user\AddressEntity;
 use app\entity\data\user\UserEntity;
 use app\entity\request\api\store\order\StoreOrderCreateRequestEntity;
@@ -10708,9 +10710,9 @@ class StoreOrderRepository extends BaseRepository
         // 订单总数量
         $totalNum = 0;
         // 此笔订单产生的总 邮费
-        $postage = 0.00;
-
-        $orderList = [];
+        $totalPostage = 0.00;
+        // 订单实体表
+        $storeOrderEntityList = [];
 
         // 循环购物车 对购物车内的商品 进行条件验证 以及根据不同的商品 计算邮费
         foreach ($cartEntityList as $numKey => $cartEntity) {
@@ -10820,6 +10822,8 @@ class StoreOrderRepository extends BaseRepository
 
             // 计算单价 systemConfig('mer_365');
             $price = bcmul($cartEntity->getCartNum(), $productAttrValueEntity->getPrice(), 2);
+            // 平台拿到的钱（商户分润）
+            $serviceMoney = bcmul($cartEntity->getCartNum(), $productAttrValueEntity->getPlateMerProfit(), 2);
             // 计算养老金 注意 此步骤需要传入商品的价格，因为上述 可能对商品的价格发生了改变
             $yanglaojin = bcadd($yanglaojin, $productRepository->yanglaojin($cartEntity->getProductId(), $price), 2);
             // 计算总价
@@ -10835,10 +10839,11 @@ class StoreOrderRepository extends BaseRepository
             // 计算运费 获取该商品的运费模板 运费表
             // TODO  注意 这个地址好像有问题，我再 客户端->收货地址管理中 （rrx_user_address）增加的廊坊市 对应的城市编号是（code_list）315 且city_id 字段的值是 2，而我再后台设置 可配送地址时 ，廊坊市对应的编码是 58247
             // 判断商品是否是 供应链(微唯宝)商品
+            $postage = 0.00;
             if (!empty($productAttrValueEntity->getGongSkuId())) {
                 $freight = GongApiRequest::freight($addressEntity->getCityId(), [['sku_id' => $productAttrValueEntity->getGongSkuId(), 'num' => $cartEntity->getCartNum()]]);
-                $freight = $freight['freight'] ?? 0;
-                $postage = bcadd($postage, $freight, 2);
+                $postage = $freight['freight'] ?? 0;
+                $totalPostage = bcadd($totalPostage, $postage, 2);
             } else {
                 $shippingTemplateEntity = $shippingTemplateRepository->getShippingTemplateEntityByShippingTemplateId($productEntity->getTempId());
                 if (empty($shippingTemplateEntity->getShippingTemplateId())) {
@@ -10890,15 +10895,16 @@ class StoreOrderRepository extends BaseRepository
                                 // 那本次 运费就是 首件运费 + （（重量 - 首件重量）/续件重量） * 续费单价
                                 // 那本次 运费就是 2 + （（5.03 - 2）/3）向上取整 * 3 = 8
                                 // 首件（重量or体积） 运费计算
-                                $postage = bcadd($postage, $shippingTemplateRegionEntity->getFirstPrice(), 2);
                                 if ($number > $shippingTemplateRegionEntity->getFirst()) {
                                     // 数量（重量or体积） 超出 首件部分 也就是续费部分
                                     $excess = bcsub($number, $shippingTemplateRegionEntity->getFirst(), 3);
                                     // 查看 需 续费几次 并向上取整
                                     $continueNum = ceil(bcdiv($excess, $shippingTemplateRegionEntity->getContinue(), 3));
-                                    $continueCost = bcmul($continueNum, $shippingTemplateRegionEntity->getContinuePrice(), 2);
-                                    $postage = bcadd($postage, $continueCost, 2);
+                                    $postage = bcmul($continueNum, $shippingTemplateRegionEntity->getContinuePrice(), 2);
+                                } else {
+                                    $postage = $shippingTemplateRegionEntity->getFirstPrice();
                                 }
+                                $totalPostage = bcadd($totalPostage, $postage, 2);
                             }
                         }
                     }
@@ -10906,7 +10912,6 @@ class StoreOrderRepository extends BaseRepository
             }
 
 
-
             // // 会员专区
             // if ($productEntity->getMerId() == CommonEnum::DESIGN_MERCHANT_ID['MemberZone']['code']) {
             //
@@ -10924,77 +10929,48 @@ class StoreOrderRepository extends BaseRepository
             // 修改 购物车状态
             $storeCartRepository->update($cartEntity->getCartId(), ['is_pay' => CartEnum::IS_PAY['Yes']['code']]);
 
-            // 修改优惠券状态
-            // $storeCouponUserRepository->updates([], []);
-
-            // StoreGroupOrderEntity
-
-            // 组装数据
-            $_order = [
-                // 平台手续费(汇付通道服务费)
-                'commission_rate' => (float)$merchantRepository->get($cartEntity->getMerId())->mer_commission_rate,
-                // '0普通1自提'
-                'order_type' => 0,
-                // 一级佣金
-                'extension_one' => 0.00,
+            // 创建订单
+            /** @var StoreOrderEntity $storeOrderEntity */
+            $storeOrderEntity = StoreOrderEntity::newInstance();
+            $storeOrderEntity->setCommissionRate((float)$merchantRepository->get($cartEntity->getMerId())->mer_commission_rate)
                 // 二级佣金 此字段已被用于分佣比例
-                'extension_two' => $productAttrValueEntity->getExtensionTwo(),
-
-                // 'orderInfo' => $cartInfo['order'],
-                // 'cartInfo' => $cartInfo['list'],
-
-                // 订单编号
-                'order_sn' => $this->getNewOrderId() . ($numKey + 1),
-                // 用户ID
-                'uid' => $cartEntity->getUid(),
-                // 收货人 用户姓名
-                'real_name' => $addressEntity->getRealName(),
-                // 收货人 用户电话
-                'user_phone' => $addressEntity->getPhone(),
-                // 收货人 地址
-                'user_address' => $addressEntity->getProvince() . $addressEntity->getCity() . $addressEntity->getDistrict() . $addressEntity->getDetail(),
-                // 详细地址id
-                'user_address_ids' => 0,
-                // 申请代理地址
-                'area_manage_address_ids' => 0,
-                'cart_id' => implode(',', array_column($cartInfo['list'], 'cart_id')),
-                'total_num' => $cartInfo['order']['total_num'],
-                'total_price' => $cartInfo['order']['total_price'],
-                'total_postage' => $cartInfo['order']['postage_price'],
-                'pay_postage' => $cartInfo['order']['postage_price'],
-                'pay_price' => $cartInfo['order']['pay_price'],
-                //                'pay_price' => '0.00',
-                'mer_id' => $cartInfo['mer_id'],
-                'cost' => $cost,
-                'coupon_id' => implode(',', $useCoupon),
-                'mark' => $mark[$cartInfo['mer_id']] ?? '',
-                'coupon_price' => $cartInfo['order']['coupon_price'] > $cartInfo['order']['total_price'] ? $cartInfo['order']['total_price'] : $cartInfo['order']['coupon_price'],
-                'pay_type' => $pay_type,
-                'share_id' => $share_id,
-                'share_uid' => $share_uid,
-                'table_id' => $table_id,
-                //                    'mer_money' => round($mer_money,2),
-                'service_money' => $service_money ?? 0,
-                'test_order' => $test_user,
-                'dacang_id' => $dacang_id,
-                'distribution_mode' => $distribution_mode,
-                'ziti_address' => $ziti_address,
-                'address_id' => $addressId,
-                'seckill' => 0,
-                'youhui_price' => $order['youhui_price'],
-                'douhuomall' => 0,
-                'fzone_paytype' => $fzone_paytype,
-                'con_pri' => $product_attr_unique_datas['plate_mer_profit'],//计算商品选中的产品规格，然后计算利润，这个利润会在每周分红中进行分润
-                'user_of_goods_id' => $getuserofgoodsid,
-                'fzone_pay_jingdou' => $array_fzone_paytype_all['fzone_pay_jingdou'],
-                'fzone_pay_vr' => $array_fzone_paytype_all['fzone_pay_vr'],
-                'fzone_pay_jifen' => $array_fzone_paytype_all['fzone_pay_jifen'],
-                'fzone_pay_price' => $array_fzone_paytype_all['fzone_pay_price'],
-                'fzone_pay_other' => $array_fzone_paytype_all['fzone_pay_other'],
-                'fzone_pay_note' => $array_fzone_paytype_all['fzone_pay_note'],
-                'fzone_pay_type' => $array_fzone_paytype_all['fzone_pay_type'],
-            ];
-
+                ->setExtensionTwo($productAttrValueEntity->getExtensionTwo())
+                ->setOrderSn($this->getNewOrderId() . ($numKey + 1))
+                ->setUid($cartEntity->getUid())
+                ->setRealName($addressEntity->getRealName())
+                ->setUserPhone($addressEntity->getPhone())
+                ->setUserAddress($addressEntity->getProvince() . $addressEntity->getCity() . $addressEntity->getDistrict() . $addressEntity->getDetail())
+                ->setCartId($cartEntity->getCartId())
+                ->setTotalNum($cartEntity->getCartNum())
+                ->setTotalPrice($price)
+                ->setTotalPostage($postage)
+                ->setPayPostage($postage)
+                ->setPayPrice($price)
+                ->setMerId($cartEntity->getMerId())
+                ->setCost(bcsub($price, $serviceMoney, 2))
+                ->setPayType($storeOrderCreateRequestEntity->getPayType())
+                ->setShareId($storeOrderCreateRequestEntity->getShareId())
+                ->setShareUid($shareEntity->getUid())
+                ->setServiceMoney($serviceMoney)
+                ->setTestOrder($userEntity->getTestUser())
+                ->setDacangId($productEntity->getDcId());
+
+
+
+
+            // // 修改优惠券状态
+            // // $storeCouponUserRepository->updates([], []);
+            // /** @var StoreGroupOrderEntity $storeGroupOrderEntity */
+            // $storeGroupOrderEntity = StoreGroupOrderEntity::newInstance();
+            // $storeGroupOrderEntity->setUid($cartEntity->getUid())
+            //     ->setGroupOrderSn($this->getNewOrderId() . '0')
+            //     ->setTotalPostage($postage)
+            //     ->setTotalPrice($price)
+            //     ->setTotalNum($cartEntity->getCartNum())
+            //     ->setRealName($addressEntity->getRealName())
+            //     ->setUserPhone($addressEntity->getPhone())
+            //     ->setUserAddress($addressEntity->getProvince() . $addressEntity->getCity() . $addressEntity->getDistrict() . $addressEntity->getDetail())
+            //     ->setPayPrice()
 
         }