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 7b12254..7a6f667 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -696,6 +696,8 @@ public class CashCollectionServiceImpl implements CashCollectionService { throw new IllegalArgumentException("币种不能为空"); if (addFundsDTO.getPaymentAmount() == null) throw new IllegalArgumentException("付款金额不能为空"); + if (addFundsDTO.getGoodNum() == null) + addFundsDTO.setGoodNum(0); //生成订单号后半部分 String orderNumber = UUID.randomUUID().toString().replaceAll("-", ""); //构建订单信息 diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 778f71e..198160c 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -425,14 +425,15 @@ insert into cash_record_collection (jwcode,name,market,activity,order_code,goods_name,good_num,pay_type,payment_currency, - payment_amount,status,order_type,received_maket,received_amount,received_currency, - performance_market,remark,handing_charge,pay_time) + payment_amount,status,order_type,received_market,received_amount,received_currency, + performance_market,remark,handling_charge,pay_time,submitter_id,submitter_market) values(#{addFundsDTO.jwcode},#{addFundsDTO.name},#{addFundsDTO.market}, #{addFundsDTO.activity},#{addFundsDTO.orderCode},#{addFundsDTO.goodsName}, #{addFundsDTO.goodNum},#{addFundsDTO.payType},#{addFundsDTO.paymentCurrency}, #{addFundsDTO.paymentAmount},#{addFundsDTO.status},#{addFundsDTO.orderType}, #{addFundsDTO.receivedMarket},#{addFundsDTO.receivedAmount},#{addFundsDTO.receivedCurrency}, - #{addFundsDTO.performanceMarket},#{addFundsDTO.remark,#{addFundsDTO.handlingCharge},#{addFundsDTO.payTime}) + #{addFundsDTO.performanceMarket},#{addFundsDTO.remark},#{addFundsDTO.handlingCharge},#{addFundsDTO.payTime}, + #{addFundsDTO.submitterId},#{addFundsDTO.submitterMarket})