From b5ab3ce0b9752d473659e4a88269f905c3af3434 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 3 Apr 2026 11:00:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?04-03=20=E6=96=B0=E5=A2=9E=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E2=80=94=E2=80=94=E5=85=B6=E4=BB=96=E6=94=B6=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/DTO/AddFundsDTO.java | 1 - .../java/com/example/demo/domain/vo/cash/CashCollection.java | 1 - src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java | 2 +- .../demo/serviceImpl/cash/CashCollectionServiceImpl.java | 8 +++++++- .../example/demo/serviceImpl/cash/CashRefundServiceImpl.java | 2 +- src/main/resources/cashMapper/CashCollectionMapper.xml | 12 ++++++++++-- src/main/resources/cashMapper/CashRefundMapper.xml | 4 ++-- 7 files changed, 21 insertions(+), 9 deletions(-) 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, From 5cc4c82811ee604c84e9e5eb4a6a7d03c754a362 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 3 Apr 2026 11:47:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?04-03=20=E6=96=B0=E5=A2=9E=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E2=80=94=E2=80=94=E5=85=B6=E4=BB=96=E6=94=B6=E5=85=A5?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/serviceImpl/cash/CashCollectionServiceImpl.java | 2 ++ src/main/resources/cashMapper/CashCollectionMapper.xml | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) 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}) From bcfbbbf1f5d81738fa9d8d04f2e9531122eeb5fb Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 3 Apr 2026 14:42:04 +0800 Subject: [PATCH 3/5] =?UTF-8?q?04-03=20=E6=96=B0=E5=A2=9E=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E2=80=94=E2=80=94iPay88=E6=89=8B=E7=BB=AD=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/cash/CashCollectionController.java | 23 ++++++++++++++++++ .../demo/mapper/cash/CashCollectionMapper.java | 2 ++ .../demo/service/cash/CashCollectionService.java | 2 ++ .../cash/CashCollectionServiceImpl.java | 28 ++++++++++++++++++++++ .../resources/cashMapper/CashCollectionMapper.xml | 10 ++++++++ 5 files changed, 65 insertions(+) diff --git a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java index 92879d0..c1d6ebb 100644 --- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java +++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java @@ -447,6 +447,29 @@ public class CashCollectionController { return Result.error(errorMsg); } } + /** + *新增iPay88手续费 + */ + @PostMapping("/addiPay88Fee") + public Result addIpay88Fee(@RequestBody CashCollection cashCollection, @RequestHeader(defaultValue = "zh_CN") String lang) { + try { + // 解析语言代码 + String languageCode = parseLanguageCode(lang); + + // 如果不是中文环境，将查询条件中的翻译文本转换为中文简体 + if (!"zh".equalsIgnoreCase(languageCode) && !"zh_cn".equalsIgnoreCase(languageCode)) { + convertTranslatedFieldsToChinese(cashCollection, languageCode); + } + + String result = cashCollectionService.addIpay88Fee(cashCollection); + String successMsg = languageTranslationUtil.translate(result, lang); + return Result.success(successMsg); + } catch (Exception e) { + String errorMsg = languageTranslationUtil.translate(e.getMessage(), lang); + return Result.error(errorMsg); + } + } + /** * 查询所有钱包类型 diff --git a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java index d6bfdc7..7eba6ce 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java @@ -124,4 +124,6 @@ public interface CashCollectionMapper { @Param("market") String market); // 添加流水--其他收入 void addExFund(@Param("addFundsDTO") CashCollection addFundsDTO); + // 添加流水--iPay88手续费 + void addIpay88Fee(CashCollection cashCollection); } diff --git a/src/main/java/com/example/demo/service/cash/CashCollectionService.java b/src/main/java/com/example/demo/service/cash/CashCollectionService.java index bc742a0..39d467c 100644 --- a/src/main/java/com/example/demo/service/cash/CashCollectionService.java +++ b/src/main/java/com/example/demo/service/cash/CashCollectionService.java @@ -56,4 +56,6 @@ public interface CashCollectionService { PageInfo selectUserWallets(Integer jwcode, String market, Integer pageNum, Integer pageSize); // 添加流水--其他收入 String addExFund(CashCollection addFundsDTO); + //添加iPay88手续费 + String addIpay88Fee(CashCollection cashCollection); } 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 7a6f667..9b2fc76 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -715,6 +715,34 @@ public class CashCollectionServiceImpl implements CashCollectionService { cashCollectionMapper.addExFund(addFundsDTO); return "添加成功"; } + //添加iPay88手续费 + @Override + public String addIpay88Fee(CashCollection cashCollection) { + if (cashCollection.getPayType()== null|| cashCollection.getPayType().isEmpty()) + throw new IllegalArgumentException("支付方式不能为空"); + if (cashCollection.getPerformanceMarket()== null|| cashCollection.getPerformanceMarket().isEmpty()) + throw new IllegalArgumentException("业绩归属地区不能为空"); + if (cashCollection.getPaymentCurrency()== null|| cashCollection.getPaymentCurrency().isEmpty()) + throw new IllegalArgumentException("币种不能为空"); + if (cashCollection.getHandlingCharge()== null|| cashCollection.getHandlingCharge().compareTo(BigDecimal.ZERO) < 0) + throw new IllegalArgumentException("手续费不能为空"); + if (cashCollection.getRemark()== null|| cashCollection.getRemark().isEmpty()) + throw new IllegalArgumentException("备注不能为空"); + //生成订单号后半部分 + String orderNumber = UUID.randomUUID().toString().replaceAll("-", ""); + //构建订单信息 + cashCollection.setOrderCode("QT_" + orderNumber); //订单号 + cashCollection.setGoodsName("手续费"); + cashCollection.setReceivedMarket("5"); + cashCollection.setPaymentAmount(BigDecimal.ZERO); + cashCollection.setJwcode(90039082); + cashCollection.setName("HomilyLink"); + cashCollection.setMarket("24032"); + cashCollection.setOrderType(1); + cashCollection.setActivity("124"); + cashCollectionMapper.addIpay88Fee(cashCollection); + return "添加成功"; + } /** * 校验钱包 ID 和到账地区的对应关系 diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 198160c..930e356 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -435,6 +435,16 @@ #{addFundsDTO.performanceMarket},#{addFundsDTO.remark},#{addFundsDTO.handlingCharge},#{addFundsDTO.payTime}, #{addFundsDTO.submitterId},#{addFundsDTO.submitterMarket}) + + insert into cash_record_collection + (order_type,jwcode,name,market,activity,order_code,goods_name,pay_type,payment_currency,handling_charge,remark,payment_amount, + received_market,performance_market,submitter_id,submitter_market,pay_time) + values(#{orderType},#{jwcode},#{name},#{market},#{activity},#{orderCode}, + #{goodsName},#{payType},#{paymentCurrency},#{handlingCharge},#{remark}, + #{paymentAmount},#{receivedMarket},#{performanceMarket},#{submitterId}, + #{submitterMarket},now() + ) + + \ No newline at end of file From 03dc6b4c46a9eff1acfd19c0c3c26011c47c368e Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 3 Apr 2026 17:52:32 +0800 Subject: [PATCH 5/5] =?UTF-8?q?04-03=20=E8=B5=84=E9=87=91=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E8=B4=A6=20=E5=9C=B0=E5=8C=BA-=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/domain/DTO/AreaPayTypeDTO.java | 1 + .../com/example/demo/domain/vo/cash/FundsDTO.java | 4 +++ .../cash/CashCollectionServiceImpl.java | 1 + .../serviceImpl/cash/CashRefundServiceImpl.java | 31 +--------------------- src/main/resources/cashMapper/CashRefundMapper.xml | 22 ++++++++++----- 5 files changed, 22 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/example/demo/domain/DTO/AreaPayTypeDTO.java b/src/main/java/com/example/demo/domain/DTO/AreaPayTypeDTO.java index c8d4a54..b0ad49c 100644 --- a/src/main/java/com/example/demo/domain/DTO/AreaPayTypeDTO.java +++ b/src/main/java/com/example/demo/domain/DTO/AreaPayTypeDTO.java @@ -15,4 +15,5 @@ public class AreaPayTypeDTO { private String areaName; private Integer payTypeId; private String payTypeName; + private String payType; // 支付方式名称：pay_type } \ No newline at end of file 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 de6cdef..8d6fde0 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 @@ -1,6 +1,7 @@ package com.example.demo.domain.vo.cash; import com.alibaba.excel.annotation.ExcelIgnore; +import com.example.demo.domain.DTO.AreaPayTypeDTO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; @@ -35,6 +36,9 @@ public class FundsDTO { private Integer goodNum; //商品数量 private String goodsName; private String payType; + // 地区+支付方式组合列表 + @ExcelIgnore + private List areaPayTypeList; @ExcelIgnore private Integer receivedCurrency; private BigDecimal paymentAmount; 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 acd9fb3..6a878a0 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -736,6 +736,7 @@ public class CashCollectionServiceImpl implements CashCollectionService { cashCollection.setOrderCode("QT_" + orderNumber); //订单号 cashCollection.setGoodsName("手续费"); cashCollection.setReceivedMarket("5"); + cashCollection.setStatus(4); cashCollection.setPaymentAmount(BigDecimal.ZERO); cashCollection.setJwcode(90039082); cashCollection.setName("HomilyLink"); 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 9df38ee..bd46183 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -1000,36 +1000,7 @@ public class CashRefundServiceImpl implements RefundService { } - /** - * 复制 FundsDTO 对象（浅拷贝） - */ - private FundsDTO copyFundsDTO(FundsDTO source) { - FundsDTO target = new FundsDTO(); - target.setId(source.getId()); - target.setPayTime(source.getPayTime()); - target.setOrderCode("TK" + source.getOrderCode()); - target.setReceivedMarket(source.getReceivedMarket()); - target.setPerformanceMarket(source.getPerformanceMarket()); - target.setName(source.getName()); - target.setJwcode(source.getJwcode()); - target.setGoodsName(source.getGoodsName()); - target.setGoodNum(source.getGoodNum()); - target.setPayType(source.getPayType()); - target.setReceivedCurrency(source.getReceivedCurrency()); - target.setPaymentAmount(source.getPaymentAmount()); - target.setHandlingCharge(source.getHandlingCharge()); - target.setReceivedAmount(source.getReceivedAmount()); - target.setMarket(source.getMarket()); - target.setMarketName(source.getMarketName()); - target.setMarkets(source.getMarkets()); - target.setPerformanceMarkets(source.getPerformanceMarkets()); - target.setPaymentCurrency(source.getPaymentCurrency()); - target.setPaymentCurrencyName(source.getPaymentCurrencyName()); - target.setReceivedCurrencyName(source.getReceivedCurrencyName()); - target.setStatus(source.getStatus()); - target.setStatusName(source.getStatusName()); - return target; - } + /** * 计算用户指定钱包列表的总可用余额 * @param jwcode 用户标识 diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index 342fbbb..f4f269c 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -498,9 +498,6 @@ and crc.`pay_time` BETWEEN #{startTime} AND #{endTime} - - AND crc.pay_type like CONCAT('%', #{payType}, '%') - AND crc.order_code like CONCAT('%', #{orderCode}, '%') @@ -510,6 +507,13 @@ #{statuses} + + AND ( + + (crc.received_market = #{item.areaId} AND crc.pay_type = #{item.payType}) + + ) + UNION ALL @@ -531,7 +535,7 @@ NULL as handlingCharge, NULL as permanentGold, NULL as freeGold, - NULL as pay_type, + crc.pay_type, crr.refund_time as pay_time, crc.status, crr.refund_currency as refundCurrency, @@ -565,12 +569,16 @@ and crc.`pay_time` BETWEEN #{startTime} AND #{endTime} - - AND crc.pay_type like CONCAT('%', #{payType}, '%') - AND crc.order_code like CONCAT('%', #{orderCode}, '%') + + AND ( + + (crc.received_market = #{item.areaId} AND crc.pay_type = #{item.payType}) + + ) + ) AS combined_result ORDER BY id,