diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index db1851910..cc79a82aa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -489,31 +489,46 @@ public class WxCouponServiceImpl implements WxCouponService { // 3. check 新的有效期是否合适 // 4. 更新库存及有效期 WxCoupon oldCoupon = wxCouponMapper.selectByPrimaryKey(wxCoupon.getId()); + if(oldCoupon == null) { + logger.error(ErrorCode.COUPON_IS_EMPTY.getMessage()); + return new ResultData(ErrorCode.COUPON_IS_EMPTY); + } + if(wxCoupon.getInventory() < wxCoupon.getRemainInventory()) { + // 总库存数要大于等于可用库存数 + logger.error("总库存数要大于等于可用库存数"); + return new ResultData(ErrorCode.COUPON_STOCK_ERR.getCode(), "总库存数要大于等于可用库存数"); + } if(wxCoupon.getInventory() < wxCoupon.getRemainInventory()) { // 总库存数要大于等于可用库存数 - return new ResultData(ErrorCode.COUPON_STOCK_ERR); + logger.error("总库存数要大于等于可用库存数"); + return new ResultData(ErrorCode.COUPON_STOCK_ERR.getCode(), "总库存数要大于等于可用库存数"); } if(wxCoupon.getInventory() <= oldCoupon.getInventory() - oldCoupon.getRemainInventory()) { // 库存可增, 可减, 但是要保证,总库存数要大于已售卖数 - return new ResultData(ErrorCode.COUPON_STOCK_ERR); + logger.error("总库存数要大于等于可用库存数"); + return new ResultData(ErrorCode.COUPON_STOCK_ERR.getCode(), "总库存数要大于已售卖数"); } if(wxCoupon.getInventory()-wxCoupon.getRemainInventory() != oldCoupon.getInventory() - oldCoupon.getRemainInventory()) { // 已售卖数不变 - return new ResultData(ErrorCode.COUPON_STOCK_ERR); + logger.error("已售卖数不变"); + return new ResultData(ErrorCode.COUPON_STOCK_ERR.getCode(), "已售卖数不变"); } if(wxCoupon.getValidType() != oldCoupon.getValidType()) { // 券有效期类型不能改变 - return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR); + logger.error("券有效期类型不能改变"); + return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR.getCode(), "券有效期类型不能改变"); } if(oldCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())) { if(wxCoupon.getValidEndDate().before(oldCoupon.getValidEndDate())) { // 券有效期只可增加 - return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR); + logger.error("券有效期只可增加"); + return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR.getCode(), "券有效期只可增加"); } } else { if(wxCoupon.getValidDays()")) { + if(respStr == null) { + throw new MallinkException(ErrorCode.ETCP_CMD_FAIL); + } + if(respStr.startsWith("")){ throw new MallinkException(ErrorCode.ETCP_CMD_FAIL); } return respStr;