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

Merge pull request '添加采购产品报价支付类型字段' (#260) from dev into main

Browse Source 
Reviewed-on: #260
This commit is contained in:
mkm 2024-10-13 16:36:51 +08:00
commit 2114d09556
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
View File

@ -107,6 +107,8 @@ class PurchaseProductOfferLogic extends BaseLogic
'price' => $params['purchase'], 'price' => $params['purchase'],
'outbound_price' => $params['outbound_price'], 'outbound_price' => $params['outbound_price'],
'total_price' => $params['total_price'], 'total_price' => $params['total_price'],
'pay_type' => $params['pay_type']??0,
'buyer_confirm' => 1,
]); ]);
// $find=BeforehandOrderCartInfo::where(['bhoid'=>$params['bhoid'],'product_id'=>$offer['product_id']])->find(); // $find=BeforehandOrderCartInfo::where(['bhoid'=>$params['bhoid'],'product_id'=>$offer['product_id']])->find();
// if($find){ // if($find){

1
app/api/controller/purchase_product_offer/PurchaseProductOfferController.php
View File

@ -41,6 +41,7 @@ class PurchaseProductOfferController extends BaseApiController
'outbound_price'=>$params['outbound_price'], 'outbound_price'=>$params['outbound_price'],
'total_price'=>$params['total_price'], 'total_price'=>$params['total_price'],
'buyer_confirm'=>1, 'buyer_confirm'=>1,
'pay_type'=>$params['pay_type']??0,
]; ];
$res=PurchaseProductOffer::where('id',$params['id'])->where('buyer_id',$this->userId)->update($data); $res=PurchaseProductOffer::where('id',$params['id'])->where('buyer_id',$this->userId)->update($data);
if($res){ if($res){