refactor(controller): 优化控制器中的数据处理逻辑

- 移除了不必要的 JMap 类引用，统一使用 JHashMap
- 简化了数据处理流程，直接使用 param 参数进行操作
- 删除了未使用的代码片段，提高了代码可读性

src/main/java/com/xynet/marketing/controller/member/MemberCouponController.java

@@ -6,7 +6,6 @@ import com.xynet.marketing.service.MercCouponService;
 import com.xynet.marketing.utils.MemberAuthUtils;
 import com.xynet.marketing.utils.R;
 import com.xynet.marketing.utils.collections.map.JHashMap;
-import com.xynet.marketing.utils.collections.map.JMap;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -29,17 +28,10 @@ public class MemberCouponController {
     private MemberCouponService memberCouponService;
 
     @PostMapping("page")
-    public R page(@RequestBody Map<String, Object> param, @RequestHeader Map<String, String> headers) {
+    public R page(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         String memberId = MemberAuthUtils.getMemberId(headers);
-        JMap<String, Object> jParam = new JHashMap<>(param);
-        Page<Map<String, Object>> data = memberCouponService.page(jParam);
+        Page<Map<String, Object>> data = memberCouponService.page(param);
         return R.ok(memberId);
     }
 
-
-    @PostMapping("saveOrUpdate")
-    private R saveOrUpdate(@RequestBody Map<String, Object> param, @RequestHeader Map<String, String> headers) {
-        JMap<String, Object> jParam = new JHashMap<>(param);
-        return R.ok(memberCouponService.saveOrUpdate(jParam));
-    }
 }

src/main/java/com/xynet/marketing/controller/merc/MercCouponController.java

@@ -10,7 +10,6 @@ import com.xynet.marketing.utils.FactoryUtils;
 import com.xynet.marketing.utils.MercAuthUtils;
 import com.xynet.marketing.utils.R;
 import com.xynet.marketing.utils.collections.map.JHashMap;
-import com.xynet.marketing.utils.collections.map.JMap;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -39,11 +38,10 @@ public class MercCouponController {
      * @return
      */
     @PostMapping("page")
-    private R page(@RequestBody Map<String, Object> param, @RequestHeader Map<String, String> headers) {
+    private R page(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         Integer mercId = MercAuthUtils.getMercId(headers);
-        JMap<String, Object> jParam = new JHashMap<>(param);
-        jParam.put("mercId", mercId);
-        Page<Map<String, Object>> data = mercCouponService.page(jParam);
+        param.put("mercId", mercId);
+        Page<Map<String, Object>> data = mercCouponService.page(param);
         return R.ok(data);
     }
 
@@ -55,11 +53,10 @@ public class MercCouponController {
      * @return
      */
     @PostMapping("saveOrUpdate")
-    private R saveOrUpdate(@RequestBody Map<String, Object> param, @RequestHeader Map<String, String> headers) {
+    private R saveOrUpdate(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         Integer mercId = MercAuthUtils.getMercId(headers);
-        JMap<String, Object> jParam = new JHashMap<>(param);
-        jParam.put("mercId", mercId);
-        return R.ok(mercCouponService.saveOrUpdate(jParam));
+        param.put("mercId", mercId);
+        return R.ok(mercCouponService.saveOrUpdate(param));
     }
 
     /**
@@ -100,11 +97,10 @@ public class MercCouponController {
      * @return
      */
     @PostMapping("obj")
-    private R obj(@RequestBody Map<String, Object> param, @RequestHeader Map<String, String> headers) {
+    private R obj(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         Integer mercId = MercAuthUtils.getMercId(headers);
-        JMap<String, Object> jParam = new JHashMap<>(param);
-        jParam.put("mercId", mercId);
-        return R.ok(mercCouponService.obj(jParam));
+        param.put("mercId", mercId);
+        return R.ok(mercCouponService.obj(param));
     }
 
     @PostMapping("mercSend")

src/main/java/com/xynet/marketing/controller/merc/PromotionController.java

@@ -7,7 +7,6 @@ import com.xynet.marketing.service.PromotionService;
 import com.xynet.marketing.utils.MercAuthUtils;
 import com.xynet.marketing.utils.R;
 import com.xynet.marketing.utils.collections.map.JHashMap;
-import com.xynet.marketing.utils.collections.map.JMap;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -37,36 +36,32 @@ public class PromotionController {
      * @return
      */
     @PostMapping("page")
-    private R page(@RequestBody Map<String, Object> param, @RequestHeader Map<String, String> headers) {
+    private R page(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         Integer mercId = MercAuthUtils.getMercId(headers);
-        JMap<String, Object> jParam = new JHashMap<>(param);
-        jParam.put("mercId", mercId);
-        Page<Map<String, Object>> data = promotionService.page(jParam);
+        param.put("mercId", mercId);
+        Page<Map<String, Object>> data = promotionService.page(param);
         return R.ok(data);
     }
 
     @PostMapping("obj")
-    private R obj(@RequestBody Map<String, Object> param, @RequestHeader Map<String, String> headers) {
+    private R obj(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         Integer mercId = MercAuthUtils.getMercId(headers);
-        JMap<String, Object> jParam = new JHashMap<>(param);
-        jParam.put("mercId", mercId);
-        return R.ok(promotionService.obj(jParam));
+        param.put("mercId", mercId);
+        return R.ok(promotionService.obj(param));
     }
 
     @PostMapping("saveOrUpdate")
-    private R saveOrUpdate(@RequestBody Map<String, Object> param, @RequestHeader Map<String, String> headers) {
+    private R saveOrUpdate(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         Integer mercId = MercAuthUtils.getMercId(headers);
-        JMap<String, Object> jParam = new JHashMap<>(param);
-        jParam.put("mercId", mercId);
-        return R.ok(promotionService.saveOrUpdate(jParam));
+        param.put("mercId", mercId);
+        return R.ok(promotionService.saveOrUpdate(param));
     }
 
     @PostMapping("updateEnableStatus")
-    private R updateEnableStatus(@RequestBody Map<String, Object> param, @RequestHeader Map<String, String> headers) {
+    private R updateEnableStatus(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         Integer mercId = MercAuthUtils.getMercId(headers);
-        JMap<String, Object> jParam = new JHashMap<>(param);
-        jParam.put("mercId", mercId);
-        promotionService.updateEnableStatus(jParam);
+        param.put("mercId", mercId);
+        promotionService.updateEnableStatus(param);
         return R.ok();
     }