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-28 18:04:27 +08:00
commit 2ce9a75c62
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/admin/lists/user/UserLists.php
View File

@ -11,6 +11,7 @@ use app\common\lists\ListsExcelInterface;
use app\common\model\user\User;
use app\common\model\user\UserAddress;
use app\common\model\vip_flow\VipFlow;
use support\Db;
class UserLists extends BaseAdminDataLists implements ListsExcelInterface
{
@ -76,6 +77,30 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface
$item['return_money'] = VipFlow::
where(['user_id'=>$item['id'],'status'=>0])
->sum('number')??0;
$address = UserAddress::where('uid',$item['id'])->find();
$item['city'] = '';
$item['area'] = '';
$item['street'] = '';
$item['village'] = '';
$item['brigade'] = '';
if($address){
if($address['city']){
$item['city'] = \think\facade\Db::name('geo_city')->where('city_code',$address['city'])->value('city_name')??'';
}
if($address['area']){
$item['area'] = \think\facade\Db::name('geo_area')->where('area_code',$address['area'])->value('area_name')??'';
}
if($address['street']){
$item['street'] = \think\facade\Db::name('geo_street')->where('street_code',$address['street'])->value('street_name')??'';
}
if($address['village']){
$item['village'] = \think\facade\Db::name('geo_village')->where('village_code',$address['village'])->value('village_name')??'';
}
if($address['brigade']){
$item['brigade'] = $address['brigade'] ? $address['brigade'].'队':'';
}
}
$item['format_address'] = $item['city'].'/'.$item['area'].'/'.$item['street'].'/'.$item['village'].'/'. $item['brigade'];
}
return $lists;

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

@ -99,14 +99,15 @@ class OrderLogic extends BaseLogic
$cart_select[$k]['purchase'] = bcmul($v['cart_num'], $find['purchase'], 2) ?? 0; //成本
$cart_select[$k]['pay_price'] = bcmul($v['cart_num'], $price, 2); //订单支付金额
$cart_select[$k]['store_price'] = bcmul($v['cart_num'], $find['cost'], 2)??0; //门店零售价
// $cart_select[$k]['vip_price'] = bcmul($v['cart_num'], $find['vip_price'], 2)??0; //vip售价
$cart_select[$k]['vip_price'] = bcmul($v['cart_num'], $find['vip_price'], 2)??0; //vip售价
$cart_select[$k]['product_id'] = $find['product_id'];
$cart_select[$k]['old_cart_id'] = $v['id'];
$cart_select[$k]['cart_num'] = $v['cart_num'];
$cart_select[$k]['verify_code'] = $params['verify_code'] ?? '';
//vip1待返回金额
// $cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'],$cart_select[$k]['vip_price'],2);
$cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'],$cart_select[$k]['vip_price'],2);
// d($cart_select[$k]['pay_price'],$cart_select[$k]['store_price'],$cart_select[$k]['vip_price'] );
$cartInfo = $cart_select[$k];
$cartInfo['name'] = $find['store_name'];

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

@ -305,10 +305,10 @@ class UserLogic extends BaseLogic
//礼品券明细
$query = UserSign::where(['uid'=>$uid]);
if($params['mark'] == 1){
$query->where('financial_pm',0);
$query->where('financial_pm',1);
}
if($params['mark'] == 2){
$query->where('financial_pm',1);
$query->where('financial_pm',0);
}
$count = $query->count();
$data =$query