refactor(controller): 修改控制器方法访问级别

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

@@ -48,12 +48,12 @@ public class MemberCouponController {
     }
 
     @PostMapping("statusMaps")
-    private R statusMaps() {
+    public R statusMaps() {
         return R.ok(MemberCouponStatusEnum.maps());
     }
 
     @PostMapping("enableList")
-    private R enableList(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
+    public R enableList(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         String thirdMemberId = MemberAuthUtils.getThirdMemberId(headers);
         param.put("thirdMemberId", thirdMemberId);
         List<Map<String, Object>> data = memberCouponService.enableList(param);
@@ -61,7 +61,7 @@ public class MemberCouponController {
     }
 
     @PostMapping("autoSend")
-    private R autoSend(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
+    public R autoSend(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         String thirdMemberId = MemberAuthUtils.getThirdMemberId(headers);
         param.put("thirdMemberId", thirdMemberId);
         param.put("mercId",

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xynet.marketing.enums.CouponSendTypeEnum;
 import com.xynet.marketing.enums.CouponTypeEnum;
 import com.xynet.marketing.enums.CouponValidTypeEnum;
+import com.xynet.marketing.service.MemberCouponService;
 import com.xynet.marketing.service.MercCouponService;
 import com.xynet.marketing.service.factory.coupon.merc.MercCouponFactory;
 import com.xynet.marketing.utils.FactoryUtils;
@@ -28,7 +29,10 @@ import java.util.Map;
 @Slf4j
 @CrossOrigin(origins = "*")
 public class MercCouponController {
-    private final MercCouponService mercCouponService;
+    private MercCouponService mercCouponService;
+
+    private MemberCouponService memberCouponService;
+
 
     /**
      * 分页查询
@@ -38,7 +42,7 @@ public class MercCouponController {
      * @return
      */
     @PostMapping("page")
-    private R page(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
+    public R page(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         Integer mercId = MercAuthUtils.getMercId(headers);
         param.put("mercId", mercId);
         Page<Map<String, Object>> data = mercCouponService.page(param);
@@ -53,7 +57,7 @@ public class MercCouponController {
      * @return
      */
     @PostMapping("saveOrUpdate")
-    private R saveOrUpdate(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
+    public R saveOrUpdate(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         Integer mercId = MercAuthUtils.getMercId(headers);
         param.put("mercId", mercId);
         return R.ok(mercCouponService.saveOrUpdate(param));
@@ -65,7 +69,7 @@ public class MercCouponController {
      * @return
      */
     @PostMapping("validTypeMaps")
-    private R validTypeMaps() {
+    public R validTypeMaps() {
         return R.ok(CouponValidTypeEnum.maps());
     }
 
@@ -75,7 +79,7 @@ public class MercCouponController {
      * @return
      */
     @PostMapping("typeMaps")
-    private R typeMaps() {
+    public R typeMaps() {
         return R.ok(CouponTypeEnum.maps());
     }
 
@@ -85,7 +89,7 @@ public class MercCouponController {
      * @return
      */
     @PostMapping("sendTypeMaps")
-    private R sendTypeMaps() {
+    public R sendTypeMaps() {
         return R.ok(CouponSendTypeEnum.maps());
     }
 
@@ -97,14 +101,14 @@ public class MercCouponController {
      * @return
      */
     @PostMapping("obj")
-    private R obj(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
+    public R obj(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         Integer mercId = MercAuthUtils.getMercId(headers);
         param.put("mercId", mercId);
         return R.ok(mercCouponService.obj(param));
     }
 
     @PostMapping("mercSend")
-    private R mercSend(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
+    public R mercSend(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         Integer mercId = MercAuthUtils.getMercId(headers);
         MercCouponFactory mercCouponFactory = FactoryUtils.getService(MercCouponFactory.class, "merc_coupon_base");
         param.put("mercId", mercId);
@@ -112,4 +116,6 @@ public class MercCouponController {
         return R.ok();
     }
 
+
+
 }

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

@@ -36,7 +36,7 @@ public class PromotionController {
      * @return
      */
     @PostMapping("page")
-    private R page(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
+    public R page(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         Integer mercId = MercAuthUtils.getMercId(headers);
         param.put("mercId", mercId);
         Page<Map<String, Object>> data = promotionService.page(param);
@@ -44,21 +44,21 @@ public class PromotionController {
     }
 
     @PostMapping("obj")
-    private R obj(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
+    public R obj(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         Integer mercId = MercAuthUtils.getMercId(headers);
         param.put("mercId", mercId);
         return R.ok(promotionService.obj(param));
     }
 
     @PostMapping("saveOrUpdate")
-    private R saveOrUpdate(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
+    public R saveOrUpdate(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         Integer mercId = MercAuthUtils.getMercId(headers);
         param.put("mercId", mercId);
         return R.ok(promotionService.saveOrUpdate(param));
     }
 
     @PostMapping("updateEnableStatus")
-    private R updateEnableStatus(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
+    public R updateEnableStatus(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         Integer mercId = MercAuthUtils.getMercId(headers);
         param.put("mercId", mercId);
         promotionService.updateEnableStatus(param);
@@ -71,7 +71,7 @@ public class PromotionController {
      * @return
      */
     @PostMapping("typeMaps")
-    private R typeMaps() {
+    public R typeMaps() {
         return R.ok(PromotionTypeEnum.maps());
     }
 
@@ -81,7 +81,7 @@ public class PromotionController {
      * @return
      */
     @PostMapping("statusMaps")
-    private R statusMaps() {
+    public R statusMaps() {
         return R.ok(PromotionStatusEnum.maps());
     }