02-11 现金收款添加模糊查询

src/main/java/com/example/demo/controller/cash/CashCollectionController.java

@@ -75,11 +75,22 @@ public class CashCollectionController {
 
     //获取收款活动列表
     @PostMapping("/getActivityList")
-    public Result getActivityList()
-    {
-        List<RechargeActivity> list = cashCollectionService.getActivityList();
-        return Result.success(list);
+    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<RechargeActivity> 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) {

src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java

@@ -53,7 +53,8 @@ public interface CashCollectionMapper {
     //根据精网号获取市场名
     String getMarketNameByJwcode(Integer jwcode);
     //获取收款活动列表
-    List<RechargeActivity> getActivityList(@Param("now")LocalDateTime now);
+    List<RechargeActivity> getActivityList(@Param("activity")String activity,
+            @Param("now")LocalDateTime now);
     //查找未同步的订单
     List<GOrder>getUnSync(@Param("size")int size);
     //给同步过去的gOrder设置同步状态

src/main/java/com/example/demo/service/cash/CashCollectionService.java

@@ -36,7 +36,7 @@ public interface CashCollectionService {
     //根据精网号获取姓名和地区
     Result getNameAndMarket(Integer jwcode,String lang);
     //获取活动列表
-    List<RechargeActivity> getActivityList();
+    List<RechargeActivity> getActivityList( String activity);
     //同步g_order订单到cash_record表
     Object syncToCashRecord();
     //根据id查询收款订单

src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java

@@ -451,9 +451,9 @@ public class CashCollectionServiceImpl implements CashCollectionService {
 
     //获取收款活动列表
     @Override
-    public List<RechargeActivity> getActivityList() {
+    public List<RechargeActivity> getActivityList(String activity) {
         LocalDateTime now = LocalDateTime.now();
-        return cashCollectionMapper.getActivityList(now);
+        return cashCollectionMapper.getActivityList(activity,now);
     }
 
     //同步g_order订单到cash_record表

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
+        <if test="activity != null and activity != ''">
+            AND ra.activity_name like concat('%',#{activity},'%')
+        </if>
+
         </select>
     <!--查找未同步的订单-->
     <select id="getUnSync" resultType="com.example.demo.domain.entity.GOrder">