|
@@ -102,7 +102,8 @@ public class MercCouponFactoryBase extends ServiceImpl<MercCouponMapper, MercCou
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void registerSend(JMap<String, Object> param) {
|
|
|
+ public List<Map<String, Object>> registerSend(JMap<String, Object> param) {
|
|
|
+ List<Map<String, Object>> result = new ArrayList<>();
|
|
|
LocalDate today = LocalDate.now();
|
|
|
String thirdMemberId = param.getString("thirdMemberId");
|
|
|
//查找商家可赠送的优惠券
|
|
@@ -128,13 +129,17 @@ public class MercCouponFactoryBase extends ServiceImpl<MercCouponMapper, MercCou
|
|
|
.set("couponId", mercCoupon.getId());
|
|
|
Map<String, Object> existNewMember = memberCouponService.obj(existParam);
|
|
|
if (!Emptys.check(existNewMember)) {
|
|
|
- memberCouponService.saveOrUpdate(modelSave(mercCoupon, thirdMemberId, "新注册赠送", null));
|
|
|
+ JMap<String, Object> memberCoupon = modelSave(mercCoupon, thirdMemberId, "新注册赠送", null);
|
|
|
+ result.add(memberCoupon);
|
|
|
+ memberCouponService.saveOrUpdate(memberCoupon);
|
|
|
}
|
|
|
});
|
|
|
+ return result;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void orderSend(JMap<String, Object> param) {
|
|
|
+ public List<Map<String, Object>> orderSend(JMap<String, Object> param) {
|
|
|
+ List<Map<String, Object>> result = new ArrayList<>();
|
|
|
String thirdMemberId = param.getString("thirdMemberId");
|
|
|
LocalDate orderCreateTime = param.getTimestamp("orderCreateTime").toLocalDateTime().toLocalDate();
|
|
|
//查找商家可赠送的优惠券
|
|
@@ -158,9 +163,12 @@ public class MercCouponFactoryBase extends ServiceImpl<MercCouponMapper, MercCou
|
|
|
Float limitAmount = sendConfig.getFloat("limitAmount");
|
|
|
//判断支付金额是否 >= 优惠券最低金额
|
|
|
if (param.getInt("payMoney") >= limitAmount * 100) {
|
|
|
- memberCouponService.saveOrUpdate(modelSave(mercCoupon, thirdMemberId, "购物后赠送", param.getString("orderId")));
|
|
|
+ JMap<String, Object> memberCoupon = modelSave(mercCoupon, thirdMemberId, "购物后赠送", param.getString("orderId"));
|
|
|
+ result.add(memberCoupon);
|
|
|
+ memberCouponService.saveOrUpdate(memberCoupon);
|
|
|
}
|
|
|
});
|
|
|
+ return result;
|
|
|
}
|
|
|
|
|
|
@Override
|