xiaohanzi 5 лет назад
Родитель
Сommit
9e2db1de3c
5 измененных файлов: 12 добавлений и 4 удалений
  1. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java
  2. +0
    -1
      mallinkService/src/main/java/com/iformall/service/PushLimitService.java
  3. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java
  4. +9
    -0
      mallinkService/src/main/java/com/iformall/service/park/ParkFactory.java
  5. +1
    -1
      mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml

+ 0
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java Просмотреть файл

@@ -39,5 +39,4 @@ public class PushLimitController extends BaseController {
pushLimitService.saveOrUpdate(pushLimit); pushLimitService.saveOrUpdate(pushLimit);
return new ResultData(); return new ResultData();
} }

} }

+ 0
- 1
mallinkService/src/main/java/com/iformall/service/PushLimitService.java Просмотреть файл

@@ -42,5 +42,4 @@ public interface PushLimitService {
* @return * @return
*/ */
boolean checkCoupon(TenantEntity tenantEntity, Long cUserId, Long couponId); boolean checkCoupon(TenantEntity tenantEntity, Long cUserId, Long couponId);

} }

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java Просмотреть файл

@@ -181,7 +181,8 @@ public class PushLimitServiceImpl implements PushLimitService {
// 4. check 每人多少天内不会重复收到一张券 // 4. check 每人多少天内不会重复收到一张券
if (pushLimit.getCouponDay() > 0) { if (pushLimit.getCouponDay() > 0) {
params.put("couponId", couponId); 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); int countForUserCoupon = wxCouponActionLogMapper.getCountByUserAndCoupon(params);
if (countForUserCoupon >= 1) { if (countForUserCoupon >= 1) {
String errMsg = "每人" + pushLimit.getCouponDay() + "天领一张券已到疲劳度上限"; String errMsg = "每人" + pushLimit.getCouponDay() + "天领一张券已到疲劳度上限";


+ 9
- 0
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.CYFParkCallbackService;
import com.iformall.service.park.impl.cyf.CYFParkService; import com.iformall.service.park.impl.cyf.CYFParkService;
import com.iformall.service.park.impl.dahua.DaHuaParkService; 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.shangan.ShangAnParkService;
import com.iformall.service.park.impl.tjd.TJDParkService; import com.iformall.service.park.impl.tjd.TJDParkService;


@@ -29,9 +31,13 @@ public class ParkFactory {
ShangAnParkService shangAnService; ShangAnParkService shangAnService;
@Autowired @Autowired
TJDParkService tjdService; TJDParkService tjdService;
@Autowired
JieShunParkService jieshunService;
@Autowired @Autowired
CYFParkCallbackService cyfCallbackService; CYFParkCallbackService cyfCallbackService;
@Autowired
JieShunParkCallbackService jieshunCallBackService;
private Map<Integer,ParkAdapterService> parkServiceMap ; private Map<Integer,ParkAdapterService> parkServiceMap ;
private Map<Integer,EnumCarVendor> enumMap ; private Map<Integer,EnumCarVendor> enumMap ;
@@ -48,6 +54,7 @@ public class ParkFactory {
parkServiceMap.put(EnumCarVendor.CAR_DAHUA.getCode(), daHuaService); parkServiceMap.put(EnumCarVendor.CAR_DAHUA.getCode(), daHuaService);
parkServiceMap.put(EnumCarVendor.CAR_SHANGAN.getCode(), shangAnService); parkServiceMap.put(EnumCarVendor.CAR_SHANGAN.getCode(), shangAnService);
parkServiceMap.put(EnumCarVendor.CAR_TJD.getCode(), tjdService); parkServiceMap.put(EnumCarVendor.CAR_TJD.getCode(), tjdService);
parkServiceMap.put(EnumCarVendor.CAR_JIESHUN.getCode(), jieshunService);
return parkServiceMap; return parkServiceMap;
} }
@@ -69,6 +76,8 @@ public class ParkFactory {
} }
callBackServiceMap = new ConcurrentHashMap<Integer, ParkCallBackAdapterService>(); callBackServiceMap = new ConcurrentHashMap<Integer, ParkCallBackAdapterService>();
callBackServiceMap.put(EnumCarVendor.CAE_CYF.getCode(), cyfCallbackService); callBackServiceMap.put(EnumCarVendor.CAE_CYF.getCode(), cyfCallbackService);
callBackServiceMap.put(EnumCarVendor.CAR_JIESHUN.getCode(), jieshunCallBackService);
return callBackServiceMap; return callBackServiceMap;
} }


+ 1
- 1
mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml Просмотреть файл

@@ -311,7 +311,7 @@
</if> </if>
AND o.c_user_id = #{cUserId} AND o.c_user_id = #{cUserId}
AND a.coupon_id = #{couponId} 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}
</select> </select>


<select id="getCountByUserAndCouponAndDate" resultType="java.lang.Integer" parameterType="hashmap"> <select id="getCountByUserAndCouponAndDate" resultType="java.lang.Integer" parameterType="hashmap">


Загрузка…
Отмена
Сохранить