diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index c5dd7e0..bbdbe90 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -713,7 +713,7 @@ public class CashCollectionServiceImpl implements CashCollectionService { addFundsDTO.setMarket("24032"); addFundsDTO.setOrderType(1); addFundsDTO.setReceivedMarket(addFundsDTO.getPerformanceMarket()); - addFundsDTO.setReceivedAmount(addFundsDTO.getPaymentAmount()); + addFundsDTO.setReceivedAmount(addFundsDTO.getPaymentAmount().subtract(addFundsDTO.getHandlingCharge())); addFundsDTO.setReceivedCurrency(addFundsDTO.getPaymentCurrency()); cashCollectionMapper.addExFund(addFundsDTO); diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 3fec95f..cb8006d 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -485,10 +485,10 @@ insert into cash_record_collection - (order_type,jwcode,name,market,activity,order_code,goods_name,pay_type,payment_currency,handling_charge,remark,payment_amount, + (order_type,jwcode,name,market,activity,order_code,goods_name,pay_type,payment_currency,received_currency,received_amount,handling_charge,remark,payment_amount, received_market,performance_market,submitter_id,submitter_market,pay_time,status) values(#{orderType},#{jwcode},#{name},#{market},#{activity},#{orderCode}, - #{goodsName},#{payType},#{paymentCurrency},#{handlingCharge},#{remark}, + #{goodsName},#{payType},#{paymentCurrency},#{paymentCurrency},(0 - #{handlingCharge}),#{handlingCharge},#{remark}, #{paymentAmount},#{receivedMarket},#{performanceMarket},#{submitterId}, #{submitterMarket},now(),#{status} )