|
@@ -1,6 +1,7 @@
|
|
|
package com.xynet.marketing.controller.member;
|
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.xynet.marketing.enums.MemberCouponStatusEnum;
|
|
|
import com.xynet.marketing.service.MemberCouponService;
|
|
|
import com.xynet.marketing.service.MercCouponService;
|
|
|
import com.xynet.marketing.utils.MemberAuthUtils;
|
|
@@ -27,11 +28,24 @@ public class MemberCouponController {
|
|
|
private MercCouponService mercCouponService;
|
|
|
private MemberCouponService memberCouponService;
|
|
|
|
|
|
+ /**
|
|
|
+ * 会员优惠券分页
|
|
|
+ *
|
|
|
+ * @param param
|
|
|
+ * @param headers
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@PostMapping("page")
|
|
|
public R page(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
|
|
|
- String memberId = MemberAuthUtils.getMemberId(headers);
|
|
|
+ String thirdMemberId = MemberAuthUtils.getThirdMemberId(headers);
|
|
|
+ param.put("thirdMemberId", thirdMemberId);
|
|
|
Page<Map<String, Object>> data = memberCouponService.page(param);
|
|
|
- return R.ok(memberId);
|
|
|
+ return R.ok(data);
|
|
|
+ }
|
|
|
+
|
|
|
+ @PostMapping("statusMaps")
|
|
|
+ private R statusMaps() {
|
|
|
+ return R.ok(MemberCouponStatusEnum.maps());
|
|
|
}
|
|
|
|
|
|
}
|