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-26 15:51:11 +08:00
commit 6c34f028a2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/api/lists/order/OrderList.php
View File

@ -52,12 +52,13 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface
->select()
->each(function ($item) {
$item['goods_list'] = StoreOrderCartInfo::where('oid', $item['id'])
->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time,old_cart_id')->limit(3)->select()
->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time,old_cart_id,cart_info')->limit(3)->select()
->each(function ($v) use ($item) {
$find = StoreBranchProduct::where('product_id', $v['product_id'])->where('store_id', $item['store_id'])->withTrashed()->find();
$v['store_name'] = $find['store_name'];
$v['image'] = $find['image'];
$v['price'] = $find['price'];
// $v['price'] = $find['price'];
$v['price'] = $v['cart_info']['price'];
$v['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name') ?? '';
});
$item['goods_count'] = count(explode(',', $item['cart_id']));

4
app/api/logic/user/UserLogic.php
View File

@ -115,6 +115,10 @@ class UserLogic extends BaseLogic
$data['openid'] = UserAuth::where(['user_id'=>$uid,'terminal'=>1])->value('openid');
$number=UserSign::where('uid',$uid)->where('status',0)->sum('number');
$data['integral']=bcadd($data['integral'],$number,2);
$number = UserSign::where('id',$uid)->where('status',0)->sum('number');
$GetNumber = UserSign::where('id',$uid)->where('status',1)->sum('number');
$data['number'] =$number;
$data['GetNumber'] =$GetNumber;
}else{
$data = [];
}