购物车逻辑兼容

app/api/controller/order/CartController.php

@@ -48,7 +48,11 @@ class CartController extends BaseApiController
             return $this->fail('库存数量不足');
         }
         if ($result) {
+            if(isset($params['type']) && $params['type'] == 1){
+                $res = CartLogic::add($params);
+            }else{
                 $res = CartLogic::edit($params);
+            }
         } else {
             $res = CartLogic::add($params);
         }

app/api/logic/order/CartLogic.php

@@ -33,6 +33,18 @@ class CartLogic extends BaseLogic
         }
         Db::startTrans();
         try {
+            //check
+            $check = Cart::where([
+                'uid' => $params['uid'],
+                'store_id' => $params['store_id'],
+                'product_id' => $params['product_id'],
+                'is_pay'=>0
+            ])->field('id')->find();
+            if($check){
+                Cart::where('id',$check['id'])->inc('cart_num',$params['cart_num'])
+                    ->update();
+                $cart['id'] = $check['id'];
+            }else{
                 $cart = Cart::create([
                     'uid' => $params['uid'],
                     'type' => $params['type']??'',
@@ -43,6 +55,7 @@ class CartLogic extends BaseLogic
                     'cart_num' => $params['cart_num'],
                     'is_new' => $params['is_new']??0,
                 ]);
+            }
             StoreProductLog::create([
                 'type'=>'cart',
                 'uid' => $params['uid'],