diff --git a/src/main/java/com/example/demo/domain/DTO/AddFundsDTO.java b/src/main/java/com/example/demo/domain/DTO/AddFundsDTO.java index 507e4a0..395a76c 100644 --- a/src/main/java/com/example/demo/domain/DTO/AddFundsDTO.java +++ b/src/main/java/com/example/demo/domain/DTO/AddFundsDTO.java @@ -20,7 +20,6 @@ import java.util.Date; @NoArgsConstructor public class AddFundsDTO { private String performanceMarket; //业绩归属地区 - private String incomeType; //收入类别 private Integer goodNum; //商品数量 private String payType; //付款方式 private Integer paymentCurrency; //付款币种 diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java index 6bc1d09..23b6a92 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java @@ -35,7 +35,6 @@ public class CashCollection implements Serializable { private Integer jwcode; // 精网号 private String name; // 姓名 private String performanceMarket; //业绩归属地区 - private String incomeType; //收入类别 @ExcelIgnore private String market; // 所属地区 private String marketName; // 所属地区名称 diff --git a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java index 778358a..de6cdef 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java +++ b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java @@ -31,9 +31,9 @@ public class FundsDTO { private String performanceMarket; //业绩归属地区 private String name; private Integer jwcode; - private String incomeType; //收入类别 private String remark; //备注 private Integer goodNum; //商品数量 + private String goodsName; private String payType; @ExcelIgnore private Integer receivedCurrency; 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 ef935a9..7b12254 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -688,7 +688,7 @@ public class CashCollectionServiceImpl implements CashCollectionService { public String addExFund(CashCollection addFundsDTO) { if (addFundsDTO.getPerformanceMarket() == null|| addFundsDTO.getPerformanceMarket().isEmpty()) throw new IllegalArgumentException("业绩归属地区不能为空"); - if (addFundsDTO.getIncomeType() == null|| addFundsDTO.getIncomeType().isEmpty()) + if (addFundsDTO.getGoodsName() == null|| addFundsDTO.getGoodsName().isEmpty()) throw new IllegalArgumentException("收入类别不能为空"); if (addFundsDTO.getPayType() == null|| addFundsDTO.getPayType().isEmpty()) throw new IllegalArgumentException("付款方式不能为空"); @@ -700,9 +700,15 @@ public class CashCollectionServiceImpl implements CashCollectionService { String orderNumber = UUID.randomUUID().toString().replaceAll("-", ""); //构建订单信息 addFundsDTO.setOrderCode("QT_" + orderNumber); //订单号 + addFundsDTO.setStatus(4); + addFundsDTO.setActivity("123"); + addFundsDTO.setJwcode(90039082); + addFundsDTO.setName("HomilyLink"); + addFundsDTO.setMarket("24032"); addFundsDTO.setOrderType(1); addFundsDTO.setReceivedMarket(addFundsDTO.getPerformanceMarket()); addFundsDTO.setReceivedAmount(addFundsDTO.getPaymentAmount()); + addFundsDTO.setReceivedCurrency(addFundsDTO.getPaymentCurrency()); cashCollectionMapper.addExFund(addFundsDTO); return "添加成功"; diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index 31b010f..9df38ee 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -1012,7 +1012,7 @@ public class CashRefundServiceImpl implements RefundService { target.setPerformanceMarket(source.getPerformanceMarket()); target.setName(source.getName()); target.setJwcode(source.getJwcode()); - target.setIncomeType(source.getIncomeType()); + target.setGoodsName(source.getGoodsName()); target.setGoodNum(source.getGoodNum()); target.setPayType(source.getPayType()); target.setReceivedCurrency(source.getReceivedCurrency()); diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 8b1f67a..778f71e 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -422,9 +422,17 @@ VALUES (#{jwcode}, #{walletId}, #{type}, #{amount}, #{orderCode}, #{description}, #{status}, NOW()) - + 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) + 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}) diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index 4bff9d2..342fbbb 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -450,7 +450,7 @@ SELECT crc.id, crc.jwcode, - crc.income_type, + crc.goods_name, crc.remark, crc.good_num, crc.performance_market, @@ -516,7 +516,7 @@ SELECT crc.id, crc.jwcode, - crc.income_type, + crc.goods_name, crc.remark, crc.good_num, crc.performance_market,