fix

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

@@ -895,8 +895,7 @@ class StoreOrderRepository extends BaseRepository
                     }
                 }
 
-                if ($payType == 5) {
-
+                if ($decScore) {
                     //更新用户积分
                     $user = Db::name('user')->where('uid', $uid)->find();
                     $user_score = $user['score'];
@@ -913,7 +912,8 @@ class StoreOrderRepository extends BaseRepository
                     $ins_data['pm'] = 2;
                     Db::name('user_sign_score')->insertGetId($ins_data);
                     Db::name('user')->where('uid', $uid)->dec('score', $decScore)->update();
-                } else if ($payType == 6) {
+                }
+                if ($decJingScore) {
                     //更新用户京豆
                     $user = Db::name('user')->where('uid', $uid)->find();
                     $userJingdou = $user['jingdou'];

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

@@ -121,6 +121,10 @@ class StoreOrder extends BaseController
         $distribution_mode = $this->request->param('distribution_mode','1');//配送方式
         $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('支付方式不正确');
+        }
         $uid = $this->request->uid();
         $gong = app()->make(ProductAttrValueRepository::class);
 
@@ -152,26 +156,41 @@ class StoreOrder extends BaseController
 
         $user_group = (int)Db::name('user') -> where('uid',$uid)->value('user_group');
 
-
-        $cartIds=Db::name('store_cart')->where('cart_id','in',$cartId)->select()->toArray();
-        $price = $decScore = $decJingScore =  0;
-        foreach ($cartIds as $k=>$item){
-            $checkGong = $gong -> checkGong($item['product_id'],$item['product_attr_unique'],$item['cart_num'],$uid,$addressId);
+//        $cartIdAndPayTypMap = [
+//            13662 => 'score',
+//            13663 => 'jingdou',
+//            13664 => 'jingdou',
+//        ];
+//        $cartId = [
+//            13662,
+//            13663,
+//            13664
+//        ];
+
+        // 商品A 后台设置是扣除60积分 或者 扣除120京豆
+        // 商品B 后台设置是扣除20积分 或者 扣除40京豆
+        // payType=5 积分支付的时候
+        //
+        $cartList=Db::name('store_cart')->where('cart_id','in',$cartId)->select()->toArray();
+        $price = $decScore = $decJingScore =  0;//总消耗积分和京豆
+        foreach ($cartList as $cartInfo){
+            $checkGong = $gong -> checkGong($cartInfo['product_id'],$cartInfo['product_attr_unique'],$cartInfo['cart_num'],$uid,$addressId);
             if(isset($checkGong['code']) && $checkGong['code'] == -1) return app('json')->fail($checkGong['message']);
-            $money=Db::name('store_product_attr_value')->where('unique',$item['product_attr_unique'])->value('price');
-            $price += bcmul($money, $item['cart_num'], 2);
+            $money=Db::name('store_product_attr_value')->where('unique',$cartInfo['product_attr_unique'])->value('price');
+            $price += bcmul($money, $cartInfo['cart_num'], 2);
 
-            $storeProduct = Db::name('store_product')->where('product_id', $item['product_id'])->find();
+            $storeProduct = Db::name('store_product')->where('product_id', $cartInfo['product_id'])->find();
             $productDecScore = $storeProduct['score'];
             $productDecJingdou = $storeProduct['jingdou'];
 
-            if ($payType == 5) {
+            $itemCartId = $cartInfo['cart_id'];
+            if ($cartIdAndPayTypMap[$itemCartId] == 'score') {
                 //积分支付的话
                 if ($productDecScore == 0) {
                     return app('json')->fail($storeProduct['store_name'] . '必须消耗积分');
                 }
                 $decScore += $productDecScore;
-            } else if ($payType == 6) {
+            } else if ($cartIdAndPayTypMap[$itemCartId] == 'jingdou') {
                 //京豆支付的话
                 if ($productDecJingdou == 0) {
                     return app('json')->fail($storeProduct['store_name'] . '必须消耗京豆');
@@ -182,25 +201,16 @@ class StoreOrder extends BaseController
         if (!$decScore && !$decJingScore) {
             return app('json')->fail('必须消耗京豆或积分');
         }
-        if ($payType == '5') {
-            if (!$decScore) {
-                return app('json')->fail('扣除积分不正确');
-            }
-            //积分兑换
-            $haveScore = Db::name('user')->where('uid', $uid)->value('score');
-            if ($haveScore < $decScore) {
-                return app('json')->fail('积分不足');
-            }
-        } else if ($payType == '6') {
-            if (!$decJingScore) {
-                return app('json')->fail('扣除京豆不正确');
-            }
-            //京豆兑换
-            $haveJingScore = Db::name('user')->where('uid', $uid)->value('jingdou');
-            if ($haveJingScore < $decJingScore) {
-                return app('json')->fail('京豆不足');
-            }
+        $userInfo = Db::name('user')->where('uid', $uid)->find();
+        $haveScore = $userInfo['score'];
+        if ($haveScore < $decScore) {
+            return app('json')->fail('积分不足');
         }
+        $haveJingScore = $userInfo['jingdou'];
+        if ($haveJingScore < $decJingScore) {
+            return app('json')->fail('京豆不足');
+        }
+
         $cartIds=Db::name('store_cart')->where('cart_id','in',$cartId)->select()->toArray();
 //        $count=count($cartIds);
         $product_id=explode('=',systemConfig('product_ids'));