From ee030d90408cdef6ba84a84fa8ee0ba32e63fd4f Mon Sep 17 00:00:00 2001 From: lijianlin Date: Wed, 11 Feb 2026 10:14:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?02-11=20=E7=8E=B0=E9=87=91=E6=94=B6?= =?UTF-8?q?=E6=AC=BE=E6=B7=BB=E5=8A=A0=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/cash/CashCollectionController.java | 19 +++++++++++++++---- .../demo/mapper/cash/CashCollectionMapper.java | 3 ++- .../demo/service/cash/CashCollectionService.java | 2 +- .../serviceImpl/cash/CashCollectionServiceImpl.java | 4 ++-- .../resources/cashMapper/CashCollectionMapper.xml | 4 ++++ 5 files changed, 24 insertions(+), 8 deletions(-) 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 dbd484f..1039a80 100644 --- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java +++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java @@ -75,11 +75,22 @@ public class CashCollectionController { //获取收款活动列表 @PostMapping("/getActivityList") - public Result getActivityList() - { - List list = cashCollectionService.getActivityList(); + public Result getActivityList(@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); + } + List list = cashCollectionService.getActivityList(cashCollection.getActivity()); return Result.success(list); - } + } catch (Exception e) { + String errorMsg = languageTranslationUtil.translate(e.getMessage(), lang); + return Result.error(errorMsg); + }} + //新增收款订单 @PostMapping("/add") public Result add(@RequestBody CashCollection cashCollection, @RequestHeader(defaultValue = "zh_CN") String lang) { 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 ab23a9e..683a0c5 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java @@ -53,7 +53,8 @@ public interface CashCollectionMapper { //根据精网号获取市场名 String getMarketNameByJwcode(Integer jwcode); //获取收款活动列表 - List getActivityList(@Param("now")LocalDateTime now); + List getActivityList(@Param("activity")String activity, + @Param("now")LocalDateTime now); //查找未同步的订单 ListgetUnSync(@Param("size")int size); //给同步过去的gOrder设置同步状态 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 cce5238..53cb796 100644 --- a/src/main/java/com/example/demo/service/cash/CashCollectionService.java +++ b/src/main/java/com/example/demo/service/cash/CashCollectionService.java @@ -36,7 +36,7 @@ public interface CashCollectionService { //根据精网号获取姓名和地区 Result getNameAndMarket(Integer jwcode,String lang); //获取活动列表 - List getActivityList(); + List getActivityList( String activity); //同步g_order订单到cash_record表 Object syncToCashRecord(); //根据id查询收款订单 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 364ca94..8be422d 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -451,9 +451,9 @@ public class CashCollectionServiceImpl implements CashCollectionService { //获取收款活动列表 @Override - public List getActivityList() { + public List getActivityList(String activity) { LocalDateTime now = LocalDateTime.now(); - return cashCollectionMapper.getActivityList(now); + return cashCollectionMapper.getActivityList(activity,now); } //同步g_order订单到cash_record表 diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 5609f50..a3f868e 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -244,6 +244,10 @@ from recharge_activity ra left join market m on m.id=ra.area where ra.flag=1 and ra.status=1 and #{now} between start_time and end_time + + AND ra.activity_name like concat('%',#{activity},'%') + +