From 9e2db1de3c18de7c8ea42d52a252c48c2cde0103 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 30 Oct 2020 15:24:09 +0800 Subject: [PATCH] fix bug --- .../iformall/controller/market/PushLimitController.java | 1 - .../main/java/com/iformall/service/PushLimitService.java | 1 - .../com/iformall/service/impl/PushLimitServiceImpl.java | 3 ++- .../main/java/com/iformall/service/park/ParkFactory.java | 9 +++++++++ .../main/resources/mapper/WxCouponActionLogMapper.xml | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java index aebd78302..2865a6997 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java @@ -39,5 +39,4 @@ public class PushLimitController extends BaseController { pushLimitService.saveOrUpdate(pushLimit); return new ResultData(); } - } diff --git a/mallinkService/src/main/java/com/iformall/service/PushLimitService.java b/mallinkService/src/main/java/com/iformall/service/PushLimitService.java index e3107d529..aa553d1a8 100644 --- a/mallinkService/src/main/java/com/iformall/service/PushLimitService.java +++ b/mallinkService/src/main/java/com/iformall/service/PushLimitService.java @@ -42,5 +42,4 @@ public interface PushLimitService { * @return */ boolean checkCoupon(TenantEntity tenantEntity, Long cUserId, Long couponId); - } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java index c9e0cf6b6..5a73d9af1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java @@ -181,7 +181,8 @@ public class PushLimitServiceImpl implements PushLimitService { // 4. check 每人多少天内不会重复收到一张券 if (pushLimit.getCouponDay() > 0) { params.put("couponId", couponId); - params.put("dayNum", pushLimit.getCouponDay()-1); + params.put("beginDate", DateUtils.getTimeBefore(pushLimit.getCouponDay()-1, curDate)); + params.put("endDate", curDate); int countForUserCoupon = wxCouponActionLogMapper.getCountByUserAndCoupon(params); if (countForUserCoupon >= 1) { String errMsg = "每人" + pushLimit.getCouponDay() + "天领一张券已到疲劳度上限"; diff --git a/mallinkService/src/main/java/com/iformall/service/park/ParkFactory.java b/mallinkService/src/main/java/com/iformall/service/park/ParkFactory.java index fc098221e..cc2861df1 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/ParkFactory.java +++ b/mallinkService/src/main/java/com/iformall/service/park/ParkFactory.java @@ -13,6 +13,8 @@ import com.iformall.service.park.impl.bolink.BoLinkParkService; import com.iformall.service.park.impl.cyf.CYFParkCallbackService; import com.iformall.service.park.impl.cyf.CYFParkService; import com.iformall.service.park.impl.dahua.DaHuaParkService; +import com.iformall.service.park.impl.jieshun.JieShunParkCallbackService; +import com.iformall.service.park.impl.jieshun.JieShunParkService; import com.iformall.service.park.impl.shangan.ShangAnParkService; import com.iformall.service.park.impl.tjd.TJDParkService; @@ -29,9 +31,13 @@ public class ParkFactory { ShangAnParkService shangAnService; @Autowired TJDParkService tjdService; + @Autowired + JieShunParkService jieshunService; @Autowired CYFParkCallbackService cyfCallbackService; + @Autowired + JieShunParkCallbackService jieshunCallBackService; private Map parkServiceMap ; private Map enumMap ; @@ -48,6 +54,7 @@ public class ParkFactory { parkServiceMap.put(EnumCarVendor.CAR_DAHUA.getCode(), daHuaService); parkServiceMap.put(EnumCarVendor.CAR_SHANGAN.getCode(), shangAnService); parkServiceMap.put(EnumCarVendor.CAR_TJD.getCode(), tjdService); + parkServiceMap.put(EnumCarVendor.CAR_JIESHUN.getCode(), jieshunService); return parkServiceMap; } @@ -69,6 +76,8 @@ public class ParkFactory { } callBackServiceMap = new ConcurrentHashMap(); callBackServiceMap.put(EnumCarVendor.CAE_CYF.getCode(), cyfCallbackService); + callBackServiceMap.put(EnumCarVendor.CAR_JIESHUN.getCode(), jieshunCallBackService); + return callBackServiceMap; } diff --git a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml index 141a789ae..724dbfb4f 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml @@ -311,7 +311,7 @@ AND o.c_user_id = #{cUserId} AND a.coupon_id = #{couponId} - AND date(a.create_time) between date_sub(curdate(),interval #{dayNum} day) and curdate() + AND date(a.create_time) between #{beginDate} and #{endDate}