Sfoglia il codice sorgente

优惠券校验修改

guanglong 3 anni fa
parent
commit
f38d22eb07

+ 6 - 0
mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/CouponMgrController.java

@@ -24,6 +24,7 @@ import com.qs.mp.common.constant.UserConstants;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.enums.CouponStatusEnum;
+import com.qs.mp.common.enums.CouponUseAreaEnum;
 import com.qs.mp.common.enums.ErrorCodeEnum;
 import com.qs.mp.system.domain.SysUser;
 import com.qs.mp.system.service.ISysUserService;
@@ -184,8 +185,13 @@ public class CouponMgrController extends BaseApiController {
 	        	String boxId = boxIdArray[i];
 	        	CouponTicket couponTicket = new CouponTicket();
 	        	couponTicket.setBoxId(boxId);
+	        	ticketList.add(couponTicket);
 	        }
 		}
+//		if(coupon.getUseArea() != CouponUseAreaEnum.COMMON 
+//				&& ticketList.size() == 0) {
+//			return AjaxResult.error("使用范围为指定盲票时需要至少选择一种盲票");
+//		}
 		// 3.插入数据
 		try {
 			couponService.saveCoupon(coupon,ticketList);

+ 0 - 2
mp-service/src/main/java/com/qs/mp/admin/domain/param/CouponParam.java

@@ -79,7 +79,6 @@ public class CouponParam {
   /**
    * 渠道代金券,渠道承担比例
    */
-  @NotNull(message = "门店默认承担比例不能为空")
   @ApiModelProperty(value = "渠道代金券,渠道承担比例", required = true)
   @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private Integer channelSharedRate;
@@ -95,7 +94,6 @@ public class CouponParam {
   /**
    * 使用范围;0通用 1生成券时指定范围 2发放时动态指定范围
    */
-  @NotNull(message = "代金券使用范围不能为空")
   @ApiModelProperty(value = "使用范围", required = true)
   @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private CouponUseAreaEnum useArea;