diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java index 4a6b4f4da..3307ae6d4 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java @@ -145,7 +145,8 @@ public class WxCarCallBackController extends BaseController return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误"+paramMap.toString()); } - // TODO 发起 营销 -- 短信 + // TODO 如果此车关联了停车优免券,自动把优免券设为已使用 + return new Result(EnumETCPCode.SUCCESS.getCode(), EnumETCPCode.SUCCESS.getMessage()); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java index 1ebb48866..3ea2906cb 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java @@ -199,7 +199,13 @@ public class WxCarController extends BaseController Integer amount = vendorParamsObj.getInteger("amount"); Integer avaliavleNum = vendorParamsObj.getInteger("avaliavleNum"); Integer amtCount = wxCouponCarService.getAmtCountByTemplateId(templateId); + if (amtCount == null) { + amtCount = 0; + } Integer availCount = wxCouponCarService.getAvaibleCountByTemplateId(templateId); + if (availCount == null) { + availCount = 0; + } if (amtCount >= amount) { logger.error("已达到停车厂商优免券数量限制"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "已达到停车厂商优免券数量限制"); @@ -276,6 +282,9 @@ public class WxCarController extends BaseController Integer amountCount = 0; try { amountCount = wxCouponCarService.getAmtCountByTemplateId(templateId); + if (amountCount == null) { + amountCount = 0; + } } catch (Exception e) { logger.error(e.getMessage()); } @@ -292,6 +301,9 @@ public class WxCarController extends BaseController Integer availCount = 0; try { availCount = wxCouponCarService.getAvaibleCountByTemplateId(templateId); + if (availCount == null) { + availCount = 0; + } } catch (Exception e) { logger.error(e.getMessage()); }