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 1039a80..dbd484f 100644 --- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java +++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java @@ -75,22 +75,11 @@ public class CashCollectionController { //获取收款活动列表 @PostMapping("/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()); + public Result getActivityList() + { + List list = cashCollectionService.getActivityList(); 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 683a0c5..ab23a9e 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java @@ -53,8 +53,7 @@ public interface CashCollectionMapper { //根据精网号获取市场名 String getMarketNameByJwcode(Integer jwcode); //获取收款活动列表 - List getActivityList(@Param("activity")String activity, - @Param("now")LocalDateTime now); + List getActivityList(@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 53cb796..cce5238 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( String activity); + List getActivityList(); //同步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 8be422d..364ca94 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(String activity) { + public List getActivityList() { LocalDateTime now = LocalDateTime.now(); - return cashCollectionMapper.getActivityList(activity,now); + return cashCollectionMapper.getActivityList(now); } //同步g_order订单到cash_record表 diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index a3f868e..5609f50 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -244,10 +244,6 @@ 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},'%') - -