|
|
@@ -356,6 +356,8 @@ class Payment extends Base{
|
|
|
$pay['cgd_pay_tag_total'] = array_sum($cgdInfo->column('pay_tag_fee'));
|
|
|
$cgdInfo = $cgdInfo->toArray();
|
|
|
foreach ($cgdInfo as $key=>&$value){
|
|
|
+ $value['inv_fee'] = $value['totalPrice']-$value['ainv_fee']-$value['winv_fee'];
|
|
|
+ $value['pay_fee'] = $value['totalPrice']-$value['apay_fee']-$value['wpay_fee'];
|
|
|
$value['orderTax'] = OrderCategory::where(['code'=>$value['sequenceNo'],'spuCode'=>$value['goodNo']])
|
|
|
->field(['cat_code', 'cat_name', 'merge_code', 'short_name', 'tax', 'inv_good_name'])->findOrEmpty();
|
|
|
$value['catInfo'] = json_decode($value['catInfo'],true);
|
