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

Merge pull request 'dev' (#62) from dev into rose

Browse Source 
Reviewed-on: #62
This commit is contained in:
mkm 2024-07-29 16:16:41 +08:00
commit 0d86926915
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -456,9 +456,9 @@ class OrderController extends BaseApiController
$params = (new OrderValidate())->post()->goCheck('add'); $params = (new OrderValidate())->post()->goCheck('add');
$uid = $this->userId; $uid = $this->userId;
//拆单逻辑 //拆单逻辑
OrderLogic::dealRefund($uid, $params); $res=OrderLogic::dealRefund($uid, $params);
$detail = StoreOrder::where('id', $params['id'])->where('refund_type',1)->where('status','in',[0,1])->find(); $detail = StoreOrder::where('id', $params['id'])->where('refund_type',1)->find();
if($detail){ if($detail && $res!=2){
$res=StoreOrderLogic::refund($detail,['order_id'=>$detail['order_id']]); $res=StoreOrderLogic::refund($detail,['order_id'=>$detail['order_id']]);
if($res!=false){ if($res!=false){
return $this->success($res); return $this->success($res);

2
app/api/logic/order/OrderLogic.php
View File

@ -834,7 +834,7 @@ class OrderLogic extends BaseLogic
} }
} }
return 1; return $order['status']??1;
} }

1
app/store/logic/WorkbenchLogic.php
View File

@ -66,6 +66,7 @@ class WorkbenchLogic extends BaseLogic
$storeFinanceWhere['store_id'] = $params['store_id']; $storeFinanceWhere['store_id'] = $params['store_id'];
$storeFinanceWhereTwo['store_id'] = $params['store_id']; $storeFinanceWhereTwo['store_id'] = $params['store_id'];
$attritionWhere['id'] = $params['store_id']; $attritionWhere['id'] = $params['store_id'];
$all_where['store_id'] = $params['store_id'];
} }
$orderLogic = new StoreOrderLogic(); $orderLogic = new StoreOrderLogic();
//订单总金额 //订单总金额