|
@@ -102,7 +102,7 @@ public class MercCouponFactoryBase extends ServiceImpl<MercCouponMapper, MercCou
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<Map<String, Object>> registerSend(JMap<String, Object> param) {
|
|
|
+ public List<Map<String, Object>> commonSend(JMap<String, Object> param) {
|
|
|
List<Map<String, Object>> result = new ArrayList<>();
|
|
|
LocalDate today = LocalDate.now();
|
|
|
String thirdMemberId = param.getString("thirdMemberId");
|
|
@@ -110,7 +110,7 @@ public class MercCouponFactoryBase extends ServiceImpl<MercCouponMapper, MercCou
|
|
|
LambdaQueryWrapper<MercCoupon> lqw = new LambdaQueryWrapper<MercCoupon>()
|
|
|
.eq(MercCoupon::getMercId, param.getInt("mercId"))
|
|
|
.eq(MercCoupon::getStatus, true)
|
|
|
- .eq(MercCoupon::getSendType, CouponSendTypeEnum.REGISTER.getCode())
|
|
|
+ .eq(MercCoupon::getSendType, param.getString("sendType"))
|
|
|
.and(wrapper -> wrapper.isNull(MercCoupon::getSendStartDate)
|
|
|
.or()
|
|
|
.le(MercCoupon::getSendStartDate, today))
|
|
@@ -134,9 +134,17 @@ public class MercCouponFactoryBase extends ServiceImpl<MercCouponMapper, MercCou
|
|
|
memberCouponService.saveOrUpdate(memberCoupon);
|
|
|
}
|
|
|
});
|
|
|
+
|
|
|
+
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public List<Map<String, Object>> registerSend(JMap<String, Object> param) {
|
|
|
+ param.set("sendType", CouponSendTypeEnum.REGISTER.getCode());
|
|
|
+ return commonSend(param);
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public List<Map<String, Object>> orderSend(JMap<String, Object> param) {
|
|
|
List<Map<String, Object>> result = new ArrayList<>();
|