mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

Browse Source
This commit is contained in:
mkm 2024-06-29 15:14:56 +08:00
commit 594a31e93c
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/api/controller/order/CartController.php
View File

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

29
app/api/logic/order/CartLogic.php
View File

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

2
app/common/logic/PayNotifyLogic.php
View File

@ -66,7 +66,7 @@ class PayNotifyLogic extends BaseLogic
public static function balancePay($orderSn, $extra = []) public static function balancePay($orderSn, $extra = [])
{ {
$order = StoreOrder::where('order_id', $orderSn)->findOrEmpty(); $order = StoreOrder::where('order_id', $orderSn)->findOrEmpty();
self::afterPay($order);d(444); self::afterPay($order);
$user = User::where('id', $order['uid'])->find(); $user = User::where('id', $order['uid'])->find();
if ($user['now_money'] < $order['pay_price']) { if ($user['now_money'] < $order['pay_price']) {
throw new \Exception('余额不足'); throw new \Exception('余额不足');