|
@@ -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)
|