fix

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

@@ -117,7 +117,7 @@ class StoreOrderRepository extends BaseRepository
      * @author xaboy
      * @day 2020/8/1
      */
-    public function createOrder(User $user, int $pay_type, array $cartId, int $addressId, array $coupons, array $takes, array $mark, bool $psType = true, $table_id = null, $share_id = 0, $payType, $mer_id = 0, $dacang_id = 0, $distribution_mode = 1, $ziti_address = '', $area_manage_address_ids = '',$youhui_price_key='',$decScore=0,$decJingScore=0)
+    public function createOrder(User $user, int $pay_type, array $cartId, int $addressId, array $coupons, array $takes, array $mark, bool $psType = true, $table_id = null, $share_id = 0, $payType, $mer_id = 0, $dacang_id = 0, $distribution_mode = 1, $ziti_address = '', $area_manage_address_ids = '',$youhui_price_key='',$cartIdAndPayTypMap)
     {
         $test_user = $user['test_user'] ?? 0;
         $address = Db::name('user_address')->field('code_list,village_id')->where('address_id', $addressId)->find();
@@ -784,7 +784,7 @@ class StoreOrderRepository extends BaseRepository
             $productRepository = app()->make(ProductRepository::class);
             $storeOrderProductRepository = app()->make(StoreOrderProductRepository::class);
 
-            $group = Db::transaction(function () use ($topUid, $spreadUid, $uid, $productCouponList, $storeCouponList, $allUseCoupon, $couponUserRepository, $storeOrderProductRepository, $productRepository, $attrValueRepository, $storeCartRepository, $storeGroupOrderRepository, $groupOrder, $orderList, $orderInfo ,$decJingScore, $decScore, $payType) {
+            $group = Db::transaction(function () use ($topUid, $spreadUid, $uid, $productCouponList, $storeCouponList, $allUseCoupon, $couponUserRepository, $storeOrderProductRepository, $productRepository, $attrValueRepository, $storeCartRepository, $storeGroupOrderRepository, $groupOrder, $orderList, $orderInfo ,$cartIdAndPayTypMap) {
                 $cartIds = [];
                 $uniqueList = [];
                 //更新库存
@@ -827,6 +827,8 @@ class StoreOrderRepository extends BaseRepository
                     $_orderInfo = $order['orderInfo'];
                     unset($order['cartInfo'], $order['orderInfo']);
                     $_order = $this->dao->create($order);
+
+                    $decScore = $decJingScore = 0;
                     foreach ($cartInfo as $k => $cart) {
 //                        $is_dacang=Db::name('da_cang_user')->where('status',1)->where('uid',$uid)->find();
 //                        $is_dacang_product = Db::name('store_product')->where('product_id',$cart['product_id'])->field('type,seckill')->find();
@@ -892,44 +894,57 @@ class StoreOrderRepository extends BaseRepository
                                 'product_type' => $cart['product_type']
                             ])
                         ];
+
+                        $cartId = $cart['cart_id'];
+                        $storeProduct = Db::name('store_product')->where('product_id', $cartInfo['product_id'])->find();
+                        $productDecScore = $storeProduct['score'];
+                        $productDecJingdou = $storeProduct['jingdou'];
+                        if ($cartIdAndPayTypMap[$cartId] == 'score') {
+                            $decScore += $productDecScore;
+                        } else if ($cartIdAndPayTypMap[$cartId] == 'jingdou') {
+                            $decJingScore += $productDecJingdou;
+                        }
                     }
-                }
 
-                if ($decScore) {
-                    //更新用户积分
-                    $user = Db::name('user')->where('uid', $uid)->find();
-                    $user_score = $user['score'];
-                    $ins_data['uid'] = $uid;
-                    $ins_data['reward_socre'] = $decScore;
-                    $ins_data['addtime'] = time();
-                    $ins_data['status'] = -1;//京豆状态1-有效 0-失效 -1待确认 创建的时候-1待确认 取消订单返还积分变为0 支付成功变为1
-                    $ins_data['order_type'] = 'store_order';
-                    $ins_data['order_id'] = $_order->order_id;
-                    $ins_data['mark'] = "兑换商品预扣积分";
-                    $ins_data['desc'] = '';
-                    $ins_data['surplus'] = $user_score - $decScore;
-                    $ins_data['type'] = 4;
-                    $ins_data['pm'] = 2;
-                    Db::name('user_sign_score')->insertGetId($ins_data);
-                    Db::name('user')->where('uid', $uid)->dec('score', $decScore)->update();
-                }
-                if ($decJingScore) {
-                    //更新用户京豆
-                    $user = Db::name('user')->where('uid', $uid)->find();
-                    $userJingdou = $user['jingdou'];
-                    $ins_data['uid'] = $uid;
-                    $ins_data['number'] = $decJingScore;
-                    $ins_data['status'] = -1;//京豆状态1-有效 0-失效 -1待确认 创建的时候-1待确认 取消订单返还积分变为0 支付成功变为1
-                    $ins_data['mark'] = "购买商品预扣京豆";
-                    $ins_data['desc'] = "购买商品预扣京豆";
-                    $ins_data['order_id'] = $_order->order_id;
-                    $ins_data['surplus'] = $userJingdou - $decJingScore;
-                    $ins_data['order_type'] = 'store_order';
-                    $ins_data['type'] = 2;
-                    $ins_data['addtime'] = time();
-                    Db::name('user_sign_jingdou')->insertGetId($ins_data);
-                    Db::name('user')->where('uid', $uid)->dec('jingdou', $decJingScore)->update();
+
+                    if ($decScore) {
+                        $decScore = $productDecScore;
+                        //更新用户积分
+                        $user = Db::name('user')->where('uid', $uid)->find();
+                        $user_score = $user['score'];
+                        $ins_data['uid'] = $uid;
+                        $ins_data['reward_socre'] = $decScore;
+                        $ins_data['addtime'] = time();
+                        $ins_data['status'] = -1;//京豆状态1-有效 0-失效 -1待确认 创建的时候-1待确认 取消订单返还积分变为0 支付成功变为1
+                        $ins_data['order_type'] = 'store_order';
+                        $ins_data['order_id'] = $_order->order_id;
+                        $ins_data['mark'] = "兑换商品预扣积分";
+                        $ins_data['desc'] = '';
+                        $ins_data['surplus'] = $user_score - $decScore;
+                        $ins_data['type'] = 4;
+                        $ins_data['pm'] = 2;
+                        Db::name('user_sign_score')->insertGetId($ins_data);
+                        Db::name('user')->where('uid', $uid)->dec('score', $decScore)->update();
+                    }
+                    if ($decJingScore) {
+                        //更新用户京豆
+                        $user = Db::name('user')->where('uid', $uid)->find();
+                        $userJingdou = $user['jingdou'];
+                        $ins_data['uid'] = $uid;
+                        $ins_data['number'] = $decJingScore;
+                        $ins_data['status'] = -1;//京豆状态1-有效 0-失效 -1待确认 创建的时候-1待确认 取消订单返还积分变为0 支付成功变为1
+                        $ins_data['mark'] = "购买商品预扣京豆";
+                        $ins_data['desc'] = "购买商品预扣京豆";
+                        $ins_data['order_id'] = $_order->order_id;
+                        $ins_data['surplus'] = $userJingdou - $decJingScore;
+                        $ins_data['order_type'] = 'store_order';
+                        $ins_data['type'] = 2;
+                        $ins_data['addtime'] = time();
+                        Db::name('user_sign_jingdou')->insertGetId($ins_data);
+                        Db::name('user')->where('uid', $uid)->dec('jingdou', $decJingScore)->update();
+                    }
                 }
+
                 $storeOrderStatusRepository->insertAll($orderStatus);
                 $storeOrderProductRepository->insertAll($orderProduct);
                 return $groupOrder;

app/controller/api/store/order/StoreOrder.php

@@ -122,6 +122,7 @@ class StoreOrder extends BaseController
         $ziti_address = $this->request->param('distribution_address','');//自提地址
         $youhui_price_key = $this->request->param('youhui_price_key','');//优惠key
         $cartIdAndPayTypMap = (array)$this->request->param('cartIdAndPayTypMap', []);
+
         if(!$cartIdAndPayTypMap){
             return app('json')->fail('支付方式不正确');
         }
@@ -162,9 +163,9 @@ class StoreOrder extends BaseController
 //            13664 => 'jingdou',
 //        ];
 //        $cartId = [
-//            13662,
-//            13663,
-//            13664
+//            13662, 订单1
+//            13663, 订单1
+//            13664  订单2
 //        ];
 
         // 商品A 后台设置是扣除60积分 或者 扣除120京豆
@@ -414,7 +415,7 @@ class StoreOrder extends BaseController
 
         makeLock()->lock();
         try {
-            $groupOrder = $this->repository->createOrder($this->request->userInfo(), array_search($payType, StoreOrderRepository::PAY_TYPE), $cartId, $addressId, $coupon, $take, $mark,$psType,$table_id,$share_id,$payType,$mer_id,$dacang_id,$distribution_mode,$ziti_address,$area_manage_address_ids,$youhui_price_key,$decScore,$decJingScore);
+            $groupOrder = $this->repository->createOrder($this->request->userInfo(), array_search($payType, StoreOrderRepository::PAY_TYPE), $cartId, $addressId, $coupon, $take, $mark,$psType,$table_id,$share_id,$payType,$mer_id,$dacang_id,$distribution_mode,$ziti_address,$area_manage_address_ids,$youhui_price_key,$cartIdAndPayTypMap);
         } catch (\Throwable $e) {
             makeLock()->unlock();
             throw $e;