Browse Source

[库存][修改]:错误信息检查

release_toaliyun_real
Stormeye Wu 7 years ago
parent
commit
886ae96cbc
2 changed files with 18 additions and 1 deletions
  1. +17
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java

+ 17
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java View File

@@ -2,11 +2,13 @@ package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.vo.WxCouponStatisVo;
import com.iformall.enums.EnumCouponValidType;
import com.iformall.service.WxCouponService;
import com.iformall.utils.DateUtils;
import io.swagger.annotations.Api;
@@ -70,6 +72,21 @@ public class WxCouponController extends BaseController {
if (wxCoupon.getId() == null) {
return new ResultData(ResultData.ERROR, "缺少id");
}
if(wxCoupon.getRemainInventory() == null || wxCoupon.getInventory() == null) {
return new ResultData(ErrorCode.COUPON_STOCK_ERR);
}
if(wxCoupon.getValidType() == null) {
return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR);
}
if(wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())) {
if(wxCoupon.getValidEndDate() == null) {
return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR);
}
} else {
if(wxCoupon.getValidDays() == null) {
return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR);
}
}
wxCoupon.setTenantId(getTenantId());
return wxCouponService.updateCouponStockAndEndTime(wxCoupon);
}


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

@@ -518,7 +518,7 @@ public class WxCouponServiceImpl implements WxCouponService {
}

wxCoupon.setOrgInventory(oldCoupon.getOrgInventory());
wxCoupon.setRemainInventory(oldCoupon.getRemainInventory());
wxCoupon.setOrgRemainInventory(oldCoupon.getRemainInventory());

int ret = wxCouponMapper.updateStockAndValidDate(wxCoupon);
if(ret != 1) {


Loading…
Cancel
Save