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