diff --git a/app/api/lists/order/OrderList.php b/app/api/lists/order/OrderList.php index f1ba4dd47..86a4e5378 100644 --- a/app/api/lists/order/OrderList.php +++ b/app/api/lists/order/OrderList.php @@ -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'])); diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php index b98b7c48c..c14d71b0e 100644 --- a/app/api/logic/user/UserLogic.php +++ b/app/api/logic/user/UserLogic.php @@ -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 = []; }