重构PurchaseProductOfferController和PurchaseProductOfferLists

- 更新PurchaseProductOfferController中的outbound_floating_lv方法,使用字典数据代替硬编码的出库上浮比例列表
- 在PurchaseProductOfferLists中添加category_name字段,提高采购供应链商品列表的信息完整性
This commit is contained in:
mkm 2024-10-12 18:08:25 +08:00
parent 32b6dab76c
commit e3d3e94a08
2 changed files with 10 additions and 6 deletions

View File

@ -5,6 +5,7 @@ namespace app\api\controller\purchase_product_offer;
use app\api\lists\purchase_product_offer\PurchaseProductOfferLists;
use app\api\controller\BaseApiController;
use app\common\model\dict\DictData;
use app\common\model\purchase_product_offer\PurchaseProductOffer;
@ -53,11 +54,12 @@ class PurchaseProductOfferController extends BaseApiController
* 出库上浮比例列表
*/
public function outbound_floating_lv(){
$data[]=[
['name'=>'干货/5','value'=>0.05],
['name'=>'鲜货/15','value'=>0.15],
['name'=>'粮油/5','value'=>0.05],
];
$list=DictData::where('type_value','outbound_floating')->field('name,value')->select()->each(function($item){
$item->name_b=$item->name;
$item->name=$item->name.'/'.$item->value;
$item->value=convertStringToNumber($item->value);
});
$data[]=$list;
return $this->success('ok',$data);
}

View File

@ -9,6 +9,7 @@ use app\common\model\delivery_service\DeliveryService;
use app\common\model\store_product\StoreProduct;
use app\common\model\store_product_unit\StoreProductUnit;
use app\api\lists\BaseApiDataLists;
use app\common\model\store_category\StoreCategory;
/**
* 采购供应链商品列表
@ -49,7 +50,7 @@ class PurchaseProductOfferLists extends BaseApiDataLists implements ListsSearchI
return [];
}
return PurchaseProductOffer::where($this->searchWhere)
->field(['id', 'order_id', 'product_id', 'price', 'buyer_nums', 'unit', 'is_buyer', 'buyer_confirm','need_num', 'buyer_id', 'status', 'mark'])
->field(['id', 'order_id', 'product_id', 'price', 'buyer_nums', 'unit', 'is_buyer', 'buyer_confirm','need_num', 'buyer_id', 'status', 'mark','update_time'])
->limit($this->limitOffset, $this->limitLength)
->order(['product_id'=>'desc','id' => 'desc'])
->select()->each(function($item){
@ -58,6 +59,7 @@ class PurchaseProductOfferLists extends BaseApiDataLists implements ListsSearchI
$item->image=$find->image;
$item->store_info=$find->store_info;
$item->unit_name=StoreProductUnit::where('id',$item->unit)->value('name');
$item->category_name=StoreCategory::where('id',$find->top_cate_id)->value('name');
if($item->is_buyer==1){
$item->is_buyer_name='需要采购';
}elseif($item->is_buyer==-1){