~API:活动:优惠券编辑:补充校验、限制;

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreMgtCouponController.java

@@ -16,7 +16,6 @@ import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtCouponAddParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtCouponFilterParam;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtCouponInfoVo;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtCouponListVo;
-import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsListVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinStoreCouponBasicVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinStoreCouponVo;
@@ -40,6 +39,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.util.Iterator;
 import java.util.List;
@@ -183,14 +183,24 @@ public class GoblinStoreMgtCouponController {
         GoblinStoreCouponBasicVo storeCouponBasicVo = mgtCouponAddParam.initStoreCouponBasicInfo();
         switch (storeCouponBasicVo.getType()) {
             case "1":// 代金
+                if (null == mgtCouponAddParam.getValFace()) {
+                    return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "减免金额不能为空");
+                }
                 storeCouponBasicVo.setValFace(mgtCouponAddParam.getValFace());
                 storeCouponBasicVo.setDeduction(mgtCouponAddParam.getValFace());
                 break;
             case "2":// 折扣
+                if (null == mgtCouponAddParam.getDiscount()) {
+                    return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "折扣额度不能为空");
+                }
                 storeCouponBasicVo.setDiscount(mgtCouponAddParam.getDiscount());
-                storeCouponBasicVo.setDeduction(mgtCouponAddParam.getDeduction());
+                BigDecimal deduction = mgtCouponAddParam.getDeduction();
+                storeCouponBasicVo.setDeduction(null == deduction ? BigDecimal.ZERO : deduction);
                 break;
             case "3":// 满减
+                if (null == mgtCouponAddParam.getValOver() || null == mgtCouponAddParam.getValMinus()) {
+                    return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "满减额度不能为空");
+                }
                 storeCouponBasicVo.setTriggers(mgtCouponAddParam.getValOver());
                 storeCouponBasicVo.setValOver(mgtCouponAddParam.getValOver());
                 storeCouponBasicVo.setValMinus(mgtCouponAddParam.getValMinus());
@@ -245,27 +255,40 @@ public class GoblinStoreMgtCouponController {
         String storeCouponId = mgtCouponEditParam.getStoreCouponId();
         GoblinStoreCouponVo storeCouponVo;
         if (StringUtils.isBlank(storeCouponId)
-                || null == (storeCouponVo = goblinRedisUtils.getStoreCouponVo(storeCouponId))) {
+                || null == (storeCouponVo = goblinRedisUtils.getStoreCouponVo(storeCouponId)) || !storeId.equals(storeCouponVo.getStoreId())) {
             return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "参数无效:优惠券ID");
         }
-        if (!storeId.equals(storeCouponVo.getStoreId())) {
-            return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "参数有误:无权编辑优惠券");
+        if (storeCouponVo.getType().equals(mgtCouponEditParam.getType())) {
+            return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "卡券类型不可变更");
         }
         if (log.isDebugEnabled()) {
             log.debug("商铺活动:优惠券编辑:[mgtCouponEditParam={}]", JsonUtils.toJson(mgtCouponEditParam));
         }
         GoblinStoreCouponBasicVo storeCouponBasicVo = mgtCouponEditParam.initStoreCouponBasicInfo();
+        storeCouponBasicVo.setType(storeCouponVo.getType());
+        storeCouponBasicVo.setState(storeCouponVo.getState());
+        storeCouponBasicVo.setStartTime(storeCouponVo.getStartTime());
         storeCouponBasicVo.setStock(storeCouponVo.getStock());// 这里库存不允许编辑修改，只可在列表页编辑'增减库存'
         switch (storeCouponBasicVo.getType()) {
             case "1":// 代金
+                if (null == mgtCouponEditParam.getValFace()) {
+                    return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "减免金额不能为空");
+                }
                 storeCouponBasicVo.setValFace(mgtCouponEditParam.getValFace());
                 storeCouponBasicVo.setDeduction(mgtCouponEditParam.getValFace());
                 break;
             case "2":// 折扣
+                if (null == mgtCouponEditParam.getDiscount()) {
+                    return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "折扣额度不能为空");
+                }
                 storeCouponBasicVo.setDiscount(mgtCouponEditParam.getDiscount());
-                storeCouponBasicVo.setDeduction(mgtCouponEditParam.getDeduction());
+                BigDecimal deduction = mgtCouponEditParam.getDeduction();
+                storeCouponBasicVo.setDeduction(null == deduction ? BigDecimal.ZERO : deduction);
                 break;
             case "3":// 满减
+                if (null == mgtCouponEditParam.getValOver() || null == mgtCouponEditParam.getValMinus()) {
+                    return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "满减额度不能为空");
+                }
                 storeCouponBasicVo.setTriggers(mgtCouponEditParam.getValOver());
                 storeCouponBasicVo.setValOver(mgtCouponEditParam.getValOver());
                 storeCouponBasicVo.setValMinus(mgtCouponEditParam.getValMinus());