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

refactor(CartList, ProductLists): 重构商品列表逻辑，移除活动特价计算，修改成本计算方式

Browse Source
This commit is contained in:
mkm 2024-06-09 16:44:10 +08:00
parent 617be65057
commit 9e240a5488
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/api/lists/order/CartList.php
View File

@ -58,15 +58,15 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists
return $item; return $item;
}) })
->toArray(); ->toArray();
$check = DictType::where('type', 'activities')->find(); // $check = DictType::where('type', 'activities')->find();
foreach ($list as $key => &$item) { foreach ($list as $key => &$item) {
$find = StoreBranchProduct::where(['id' => $item['product_id']]) $find = StoreBranchProduct::where(['id' => $item['product_id']])
->field('product_id,image,price,cost,store_name,unit') ->field('product_id,image,price,cost,store_name,unit')
->find(); ->find();
if (isset($check) && $check['status'] == 1) { // if (isset($check) && $check['status'] == 1) {
$find['price'] = $find['cost']; // $find['price'] = $find['cost'];
} // }
if ($find) { if ($find) {
$item['goods_total_price'] = bcmul($item['cart_num'], $find['price'], 2); $item['goods_total_price'] = bcmul($item['cart_num'], $find['price'], 2);
$this->total_price = bcadd($this->total_price, $item['goods_total_price'], 2); $this->total_price = bcadd($this->total_price, $item['goods_total_price'], 2);

22
app/api/lists/product/ProductLists.php
View File

@ -140,17 +140,17 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface
} }
$check = DictType::where('type','activities')->find(); $check = DictType::where('type','activities')->find();
foreach ($data as &$value){ // foreach ($data as &$value){
if(isset($check) && $check['status'] == 1){ // if(isset($check) && $check['status'] == 1){
// $value['price'] = StoreProduct::where('id',$value['product_id'])->value('ot_price'); // // $value['price'] = StoreProduct::where('id',$value['product_id'])->value('ot_price');
$value['ot_price'] = $value['price']; // $value['ot_price'] = $value['price'];
$value['price'] = $value['cost']; // $value['price'] = $value['cost'];
} // }
$value['is_default'] = 0; // $value['is_default'] = 0;
if($store_id == 2){ // if($store_id == 2){
$value['is_default'] = 1; // $value['is_default'] = 1;
} // }
} // }
return $data; return $data;
// return StoreProduct::where($this->searchWhere)->where($where) // return StoreProduct::where($this->searchWhere)->where($where)
// ->field(['id', 'cate_id','store_name','unit', 'ot_price', 'bar_code','image','sales','store_info']) // ->field(['id', 'cate_id','store_name','unit', 'ot_price', 'bar_code','image','sales','store_info'])