Prechádzať zdrojové kódy

refactor(marketing): 会员优惠券相关方法重构

- 新增 getMercId 方法,用于获取商户 ID
hechunping 5 mesiacov pred
rodič
commit
a592171eb4

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

@@ -38,10 +38,14 @@ public class MemberCouponServiceImpl extends ServiceImpl<MemberCouponMapper, Mem
 
     private MercProjectDeviceService deviceService;
 
+    private String getMercId(String thirdMercId) {
+        return "1";
+    }
+
     private LambdaQueryWrapper<MemberCoupon> commonQueryWrapper(JMap<String, Object> param) {
         LambdaQueryWrapper<MemberCoupon> lqw = new LambdaQueryWrapper<MemberCoupon>()
                 .eq(Emptys.check(param.getInt("id")), MemberCoupon::getId, param.getInt("id"))
-                .eq(Emptys.check(param.getInt("mercId")), MemberCoupon::getMercId, param.getInt("mercId"))
+                .eq(Emptys.check(param.getString("thirdMercId")), MemberCoupon::getMercId, param.getString("thirdMercId"))
                 .eq(Emptys.check(param.getInt("couponId")), MemberCoupon::getCouponId, param.getInt("couponId"))
                 .eq(Emptys.check(param.getString("thirdMemberId")), MemberCoupon::getThirdMemberId, param.getString("thirdMemberId"))
                 .eq(Emptys.check(param.getString("status")), MemberCoupon::getStatus, param.getString("status"))
@@ -85,13 +89,13 @@ public class MemberCouponServiceImpl extends ServiceImpl<MemberCouponMapper, Mem
         List<Map<String, Object>> result = new ArrayList<>();
         LocalDate now = LocalDate.now();
         String thirdMemberId = param.getString("thirdMemberId");
-        Integer mercId = param.getInt("mercId");
         String deviceId = param.getString("deviceId");
         String orderAmount = param.getString("orderAmount");
+        String thirdMercId = param.getString("thirdMercId");
         //List<Object> goodsIdList = param.getList("goodsIdList");
         LambdaQueryWrapper<MemberCoupon> lqw = new LambdaQueryWrapper<MemberCoupon>()
                 .eq(MemberCoupon::getThirdMemberId, thirdMemberId)
-                .eq(MemberCoupon::getMercId, mercId)
+                .eq(MemberCoupon::getMercId, getMercId(thirdMercId))
                 .eq(MemberCoupon::getStatus, MemberCouponStatusEnum.UNUSED.getCode())
                 .le(MemberCoupon::getUseMinPrice, orderAmount)
                 .le(MemberCoupon::getValidStartDate, now)