fix

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

@@ -121,14 +121,14 @@ 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
-        $decScore = $this->request->param('decScore','');//消耗积分值
-        $decJingScore = $this->request->param('decJingScore','');//消耗京豆值
         $uid = $this->request->uid();
         $gong = app()->make(ProductAttrValueRepository::class);
 
-        \think\facade\Log::info("createOrder params".json_encode(input()));
-//        $payType = 6;
-//        $decJingScore = 100;
+        $allParams = input();
+        \think\facade\Log::info("createOrder params".json_encode($allParams));
+
+        $cartId = $allParams['cart_id'];
+        \think\facade\Log::info("createOrder cart_id".json_encode($cartId));
 
 //        Db::name('log')->insert(['data'=>'购物车ID---'.$cartId[0]]);
         $price=0;
@@ -149,20 +149,38 @@ class StoreOrder extends BaseController
         if (!in_array($payType, [5, 6])) {
             return app('json')->fail('支付方式不正确');
         }
-        if (!$decScore && !$decJingScore) {
-            return app('json')->fail('必须消耗京豆或积分');
-        }
 
         $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 = 0;
+        $price = $decScore = $decJingScore =  0;
         foreach ($cartIds as $k=>$item){
             $checkGong = $gong -> checkGong($item['product_id'],$item['product_attr_unique'],$item['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);
+            $price += bcmul($money, $item['cart_num'], 2);
+
+            $storeProduct = Db::name('store_product')->where('product_id', $item['product_id'])->find();
+            $productDecScore = $storeProduct['score'];
+            $productDecJingdou = $storeProduct['jingdou'];
+
+            if ($payType == 5) {
+                //积分支付的话
+                if ($productDecScore == 0) {
+                    return app('json')->fail($storeProduct['store_name'] . '必须消耗积分');
+                }
+                $decScore += $productDecScore;
+            } else if ($payType == 6) {
+                //京豆支付的话
+                if ($productDecJingdou == 0) {
+                    return app('json')->fail($storeProduct['store_name'] . '必须消耗京豆');
+                }
+                $decJingScore += $productDecJingdou;
+            }
+        }
+        if (!$decScore && !$decJingScore) {
+            return app('json')->fail('必须消耗京豆或积分');
         }
         if ($payType == '5') {
             if (!$decScore) {