Forráskód Böngészése

refactor(marketing): 重构营销模块实体属性并添加对象查询功能

- 修改 MercCoupon 实体类,将 scheme 字段重命名为 price
- 在 MercCouponController 和 PromotionController 中添加 obj 方法实现对象查询
hechunping 4 hónapja
szülő
commit
ae26cfef7f

+ 15 - 0
src/main/java/com/xynet/marketing/controller/merc/MercCouponController.java

@@ -89,4 +89,19 @@ public class MercCouponController {
         return R.ok(CouponSendTypeEnum.maps());
     }
 
+    /**
+     * 对象查询
+     *
+     * @param param
+     * @param headers
+     * @return
+     */
+    @PostMapping("obj")
+    private R obj(@RequestBody Map<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));
+    }
+
 }

+ 8 - 0
src/main/java/com/xynet/marketing/controller/merc/PromotionController.java

@@ -44,6 +44,14 @@ public class PromotionController {
         return R.ok(data);
     }
 
+    @PostMapping("obj")
+    private R obj(@RequestBody Map<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));
+    }
+
     @PostMapping("saveOrUpdate")
     private R saveOrUpdate(@RequestBody Map<String, Object> param, @RequestHeader Map<String, String> headers) {
         Integer mercId = MercAuthUtils.getMercId(headers);

+ 1 - 1
src/main/java/com/xynet/marketing/entity/MercCoupon.java

@@ -50,7 +50,7 @@ public class MercCoupon implements Serializable {
 
     private String type;
 
-    private String scheme;
+    private String price;
 
     private String status;