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-22 11:12:49 +08:00
commit d7774568ac
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,9 +137,9 @@ class OrderLogic extends BaseLogic
$pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额
} }
if($pay_price < 500){ // if($pay_price < 500){
throw new Exception('金额低于500'); // throw new Exception('金额低于500');
} // }
//成本价 收益 //成本价 收益
$order = [ $order = [

9
app/common/logic/store_order/StoreOrderLogic.php
View File

@ -111,7 +111,8 @@ class StoreOrderLogic extends BaseLogic
self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格 self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格
// self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2); // self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2);
} }
if ($user && $user['user_ship'] == 1) { $pay_type = isset($params['pay_type'])?$params['pay_type']:0;
if ($user && $user['user_ship'] == 1 && $pay_type !=17) {
$pay_price = self::$pay_price; $pay_price = self::$pay_price;
$activity_string = ''; $activity_string = '';
}else{ }else{
@ -119,9 +120,9 @@ class StoreOrderLogic extends BaseLogic
$activity_string = '减免'; $activity_string = '减免';
} }
if($pay_price < 500){ // if($pay_price < 500){
throw new \think\Exception('金额低于500'); // throw new \think\Exception('金额低于500');
} // }
$vipPrice = 0; $vipPrice = 0;
//成本价 收益 //成本价 收益

3
app/store/lists/store_order/StoreOrderLists.php
View File

@ -55,7 +55,7 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
$this->searchWhere[] = ['pay_type','in',[7,3,18]]; $this->searchWhere[] = ['pay_type','in',[7,3,18]];
} }
return StoreOrder::where($this->searchWhere) return StoreOrder::where($this->searchWhere)
->field(['id', 'order_id', 'pay_price', 'pay_time', 'pay_type', 'status','paid']) ->field(['id', 'order_id', 'pay_price', 'pay_time', 'pay_type', 'status','paid','total_num'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function ($item) use ($store_id) { ->select()->each(function ($item) use ($store_id) {
@ -77,7 +77,6 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
} else { } else {
$item['product_info'] = []; $item['product_info'] = [];
} }
return $item; return $item;
}) })
->toArray(); ->toArray();