From bcfbbbf1f5d81738fa9d8d04f2e9531122eeb5fb Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 3 Apr 2026 14:42:04 +0800 Subject: [PATCH] =?UTF-8?q?04-03=20=E6=96=B0=E5=A2=9E=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=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() + ) +