hehao před 1 rokem
rodič
revize
b191214597

+ 1 - 1
app/common/repositories/store/order/StoreOrderRepository.php

@@ -919,7 +919,7 @@ class StoreOrderRepository extends BaseRepository
919
                     $userJingdou = $user['jingdou'];
919
                     $userJingdou = $user['jingdou'];
920
                     $ins_data['uid'] = $uid;
920
                     $ins_data['uid'] = $uid;
921
                     $ins_data['number'] = $decJingScore;
921
                     $ins_data['number'] = $decJingScore;
922
-                    $ins_data['status'] = 1;//京豆状态1-有效 0-失效 -1待确认 创建的时候-1待确认 取消订单返还积分变为0 支付成功变为1
922
+                    $ins_data['status'] = -1;//京豆状态1-有效 0-失效 -1待确认 创建的时候-1待确认 取消订单返还积分变为0 支付成功变为1
923
                     $ins_data['mark'] = "购买商品预扣京豆";
923
                     $ins_data['mark'] = "购买商品预扣京豆";
924
                     $ins_data['desc'] = "购买商品预扣京豆";
924
                     $ins_data['desc'] = "购买商品预扣京豆";
925
                     $ins_data['order_id'] = $_order->order_id;
925
                     $ins_data['order_id'] = $_order->order_id;

+ 8 - 2
app/controller/api/store/order/StoreOrder.php

@@ -127,8 +127,8 @@ class StoreOrder extends BaseController
127
         $gong = app()->make(ProductAttrValueRepository::class);
127
         $gong = app()->make(ProductAttrValueRepository::class);
128
 
128
 
129
         \think\facade\Log::info("createOrder params".json_encode(input()));
129
         \think\facade\Log::info("createOrder params".json_encode(input()));
130
-        $payType = 5;
131
-        $decScore = 100;
130
+//        $payType = 6;
131
+//        $decJingScore = 100;
132
 
132
 
133
 //        Db::name('log')->insert(['data'=>'购物车ID---'.$cartId[0]]);
133
 //        Db::name('log')->insert(['data'=>'购物车ID---'.$cartId[0]]);
134
         $price=0;
134
         $price=0;
@@ -165,12 +165,18 @@ class StoreOrder extends BaseController
165
             $price+=bcmul($money,$item['cart_num'],2);
165
             $price+=bcmul($money,$item['cart_num'],2);
166
         }
166
         }
167
         if ($payType == '5') {
167
         if ($payType == '5') {
168
+            if (!$decScore) {
169
+                return app('json')->fail('扣除积分不正确');
170
+            }
168
             //积分兑换
171
             //积分兑换
169
             $haveScore = Db::name('user')->where('uid', $uid)->value('score');
172
             $haveScore = Db::name('user')->where('uid', $uid)->value('score');
170
             if ($haveScore < $decScore) {
173
             if ($haveScore < $decScore) {
171
                 return app('json')->fail('积分不足');
174
                 return app('json')->fail('积分不足');
172
             }
175
             }
173
         } else if ($payType == '6') {
176
         } else if ($payType == '6') {
177
+            if (!$decJingScore) {
178
+                return app('json')->fail('扣除京豆不正确');
179
+            }
174
             //京豆兑换
180
             //京豆兑换
175
             $haveJingScore = Db::name('user')->where('uid', $uid)->value('jingdou');
181
             $haveJingScore = Db::name('user')->where('uid', $uid)->value('jingdou');
176
             if ($haveJingScore < $decJingScore) {
182
             if ($haveJingScore < $decJingScore) {