Browse Source

Merge remote-tracking branch 'origin/develop' into develop

release_toaliyun_real
luozukai 7 years ago
parent
commit
1dfa4838d0
2 changed files with 25 additions and 7 deletions
  1. +21
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
  2. +4
    -1
      mallinkService/src/main/java/com/iformall/utils/ETCPUtil.java

+ 21
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java View File

@@ -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()<oldCoupon.getValidDays()) {
// 券有效期只可增加
return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR);
logger.error("券有效期只可增加");
return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR.getCode(), "券有效期只可增加");
}
}



+ 4
- 1
mallinkService/src/main/java/com/iformall/utils/ETCPUtil.java View File

@@ -702,7 +702,10 @@ public class ETCPUtil {

String respStr = doPost(baseUrl + parkingStatusUrl.replaceAll("\\{version}", version),
data, sign, timeStamp, merchantNo);
if(respStr.startsWith("<html>")) {
if(respStr == null) {
throw new MallinkException(ErrorCode.ETCP_CMD_FAIL);
}
if(respStr.startsWith("<html>")){
throw new MallinkException(ErrorCode.ETCP_CMD_FAIL);
}
return respStr;


Loading…
Cancel
Save