|
@@ -141,7 +141,7 @@ public class MercCouponFactoryBase extends ServiceImpl<MercCouponMapper, MercCou
|
|
|
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.getLocalDateTime("orderCreateTime").toLocalDate();
|
|
|
+ String orderCreateTime = param.getString("orderCreateTime");
|
|
|
//查找商家可赠送的优惠券
|
|
|
LambdaQueryWrapper<MercCoupon> lqw = new LambdaQueryWrapper<MercCoupon>()
|
|
|
.eq(MercCoupon::getMercId, param.getInt("mercId"))
|
|
@@ -157,7 +157,6 @@ public class MercCouponFactoryBase extends ServiceImpl<MercCouponMapper, MercCou
|
|
|
if (!Emptys.check(list)) {
|
|
|
throw new BusinessException("没有可赠送的优惠券!");
|
|
|
}
|
|
|
- //TODO 判断设备条件
|
|
|
list.forEach(mercCoupon -> {
|
|
|
JSONObject sendConfig = JSONUtil.parseObj(mercCoupon.getSendConfig());
|
|
|
Float limitAmount = sendConfig.getFloat("limitAmount");
|