Ver Fonte

refactor(marketing): 优惠券相关功能重构

- 在 MemberCouponController 中添加 provider-id 参数
- 在 MemberCouponServiceImpl 中引入 MercService 接口
- 移除 getMercId 方法,使用 MercService 中的方法转换第三方商户 ID
hechunping há 3 meses atrás
pai
commit
82f8f2e36d

+ 1 - 0
src/main/java/com/xynet/marketing/controller/member/MemberCouponController.java

@@ -56,6 +56,7 @@ public class MemberCouponController {
     public R enableList(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
         String thirdMemberId = MemberAuthUtils.getThirdMemberId(headers);
         param.put("thirdMemberId", thirdMemberId);
+        param.put("provider-id", headers.get("provider-id"));
         List<Map<String, Object>> data = memberCouponService.enableList(param);
         return R.ok(data);
     }

+ 3 - 4
src/main/java/com/xynet/marketing/service/impl/MemberCouponServiceImpl.java

@@ -16,6 +16,7 @@ import com.xynet.marketing.mapper.MemberCouponMapper;
 import com.xynet.marketing.service.MemberCouponService;
 import com.xynet.marketing.service.MercProjectDeviceService;
 import com.xynet.marketing.service.MercProjectGoodsService;
+import com.xynet.marketing.service.MercService;
 import com.xynet.marketing.utils.Emptys;
 import com.xynet.marketing.utils.collections.map.JHashMap;
 import com.xynet.marketing.utils.collections.map.JMap;
@@ -47,9 +48,7 @@ public class MemberCouponServiceImpl extends ServiceImpl<MemberCouponMapper, Mem
 
     private MercProjectDeviceService deviceService;
 
-    private String getMercId(String thirdMercId) {
-        return "1";
-    }
+    private MercService mercService;
 
     private LambdaQueryWrapper<MemberCoupon> commonQueryWrapper(JMap<String, Object> param) {
         LambdaQueryWrapper<MemberCoupon> lqw = new LambdaQueryWrapper<MemberCoupon>()
@@ -109,7 +108,7 @@ public class MemberCouponServiceImpl extends ServiceImpl<MemberCouponMapper, Mem
         List<JMap<String, Object>> goodsList = param.getListMap("goodsList");
         LambdaQueryWrapper<MemberCoupon> lqw = new LambdaQueryWrapper<MemberCoupon>()
                 .eq(MemberCoupon::getThirdMemberId, thirdMemberId)
-                .eq(MemberCoupon::getMercId, getMercId(thirdMercId))
+                .eq(MemberCoupon::getMercId, mercService.thirdMercIdToMercId(param.getString("provider-id"), thirdMercId))
                 .eq(MemberCoupon::getStatus, MemberCouponStatusEnum.UNUSED.getCode())
                 .le(MemberCoupon::getUseMinPrice, orderAmount)
                 .le(MemberCoupon::getValidStartDate, now)