Explorar el Código

[券库存有效期][修改]:券库存有效期不支持停车券

release_toaliyun_real
Stormeye Wu hace 7 años
padre
commit
7d08f47863
Se han modificado 2 ficheros con 13 adiciones y 0 borrados
  1. +12
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java

+ 12
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Ver fichero

@@ -8,6 +8,7 @@ import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController; import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.domain.vo.WxCouponStatisVo;
import com.iformall.enums.EnumCouponType;
import com.iformall.enums.EnumCouponValidType; import com.iformall.enums.EnumCouponValidType;
import com.iformall.service.WxCouponService; import com.iformall.service.WxCouponService;
import com.iformall.utils.DateUtils; import com.iformall.utils.DateUtils;
@@ -70,26 +71,37 @@ public class WxCouponController extends BaseController {
public ResultData updateStokeAndValidDate(@RequestBody WxCoupon wxCoupon) { public ResultData updateStokeAndValidDate(@RequestBody WxCoupon wxCoupon) {
logger.debug("[" + getIpAddr() + "] WxCouponController::updateStokeAndValidDate"); logger.debug("[" + getIpAddr() + "] WxCouponController::updateStokeAndValidDate");
if (wxCoupon.getId() == null) { if (wxCoupon.getId() == null) {
logger.error("缺少id");
return new ResultData(ResultData.ERROR, "缺少id"); return new ResultData(ResultData.ERROR, "缺少id");
} }
if(wxCoupon.getRemainInventory() == null || wxCoupon.getInventory() == null) { if(wxCoupon.getRemainInventory() == null || wxCoupon.getInventory() == null) {
logger.error("库存错误1");
return new ResultData(ErrorCode.COUPON_STOCK_ERR); return new ResultData(ErrorCode.COUPON_STOCK_ERR);
} }
if(wxCoupon.getRemainInventory() > wxCoupon.getInventory()) { if(wxCoupon.getRemainInventory() > wxCoupon.getInventory()) {
logger.error("库存错误2");
return new ResultData(ErrorCode.COUPON_STOCK_ERR); return new ResultData(ErrorCode.COUPON_STOCK_ERR);
} }
if(wxCoupon.getValidType() == null) { if(wxCoupon.getValidType() == null) {
logger.error("库存错误3");
return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR); return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR);
} }
if(wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())) { if(wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())) {
if(wxCoupon.getValidEndDate() == null) { if(wxCoupon.getValidEndDate() == null) {
logger.error("有效期错误1");
return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR); return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR);
} }
} else { } else {
if(wxCoupon.getValidDays() == null) { if(wxCoupon.getValidDays() == null) {
logger.error("有效期错误2");
return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR); return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR);
} }
} }
if(wxCoupon.getType().equals(EnumCouponType.COUPON_TINGCHE.getCode()) ||
wxCoupon.getType().equals(EnumCouponType.COUPON_CREDIT_PARK.getCode())) {
logger.error("券库存有效期不支持停车券");
return new ResultData(ErrorCode.COUPON_STOCK_DATE_NO_CAR);
}
wxCoupon.setTenantId(getTenantId()); wxCoupon.setTenantId(getTenantId());
return wxCouponService.updateCouponStockAndEndTime(wxCoupon); return wxCouponService.updateCouponStockAndEndTime(wxCoupon);
} }


+ 1
- 0
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Ver fichero

@@ -109,6 +109,7 @@ public enum ErrorCode{
COUPON_STOCK_ERR(2034, "券库存设置错误"), COUPON_STOCK_ERR(2034, "券库存设置错误"),
COUPON_VALID_DATE_ERR(2035, "券有效期设置错误"), COUPON_VALID_DATE_ERR(2035, "券有效期设置错误"),
COUPON_STOCK_VALID_DATE_SETTING_ERR(2036, "券库存有效期未修改"), COUPON_STOCK_VALID_DATE_SETTING_ERR(2036, "券库存有效期未修改"),
COUPON_STOCK_DATE_NO_CAR(2037, "券库存不支持停车券"),


PUSH_LIMIT_UP_TO_1DAYLIMIT(2040, "此用户一天内发券到达疲劳度限制"), PUSH_LIMIT_UP_TO_1DAYLIMIT(2040, "此用户一天内发券到达疲劳度限制"),
PUSH_LIMIT_UP_TO_COUPONLIMIT(2041, "此用户发此券到达疲劳度限制"), PUSH_LIMIT_UP_TO_COUPONLIMIT(2041, "此用户发此券到达疲劳度限制"),


Cargando…
Cancelar
Guardar