|
|
@@ -15,7 +15,7 @@ class Payment extends Base{
|
|
|
$valid=Validate::rule(["cids|采购单id集合"=>"require|array"]);
|
|
|
if ($valid->check($params)===false) return error($valid->getError());
|
|
|
$cgdlist = CgdInfo::whereIn("id",$params['cids'])
|
|
|
- ->field("sequenceNo,supplierNo,totalPrice,companyNo")->select();
|
|
|
+ ->field("sequenceNo,supplierNo,totalPrice,companyNo,wpay_fee,winv_fee")->select();
|
|
|
if($cgdlist->isEmpty())return error("采购单数据不能为空");
|
|
|
$supplier =array_unique($cgdlist->column('supplierNo')) ;
|
|
|
$company = array_unique($cgdlist->column("companyNo"));
|
|
|
@@ -36,8 +36,8 @@ class Payment extends Base{
|
|
|
$temp= [
|
|
|
"cgdNo"=>$v['sequenceNo'],
|
|
|
"total_fee"=>$v['totalPrice'],
|
|
|
- "wapy_fee"=>$v['totalPrice']- $v['pay_tag_fee'],
|
|
|
- "winv_fee"=>$v['totalPrice']- $v['inv_tag_fee'],
|
|
|
+ "wapy_fee"=>$v['wpay_fee'],
|
|
|
+ "winv_fee"=>$v['winv_fee'],
|
|
|
"payNo"=>$payNo
|
|
|
];
|
|
|
if (!isset($orderCate[$v['sequenceNo']])) return error("采购单{$v['sequenceNo']}数据商品进项类目不存在");
|
|
|
@@ -45,8 +45,8 @@ class Payment extends Base{
|
|
|
if($v['status']==2) return error("采购单{$v['sequenceNo']}数据不结算");
|
|
|
$payinfo[]=$temp;
|
|
|
$totalPrice+=$v['totalPrice'];
|
|
|
- $wpay_fee+=$v['totalPrice']-$v['pay_tag_fee'];
|
|
|
- $winv_fee+=$v['totalPrice']-$v['inv_tag_fee'];
|
|
|
+ $wpay_fee+=$v['wpay_fee'];
|
|
|
+ $winv_fee+=$v['winv_fee'];
|
|
|
}
|
|
|
$paydata=[
|
|
|
'payNo'=>$payNo,
|
