zoujiajian vor 3 Jahren
Ursprung
Commit
f1c6d6419d

+ 1 - 0
netflix-dao/src/main/java/com/cyksj/model/entity/Coupon.java

@@ -55,6 +55,7 @@ public class Coupon extends BaseEntity {
 	/**
 	 * 平台规格集合
 	 */
+	@NotEmpty
 	private String goodsSkuIds;
 
 	/**

+ 10 - 13
netflix-service/src/main/java/com/cyksj/service/mange/coupon/impl/CouponCommonServiceImpl.java

@@ -197,26 +197,23 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 
 
 	public void checkCouponParamsAndSaveOrUpdate(Coupon coupon) throws Exception {
-		List<Coupon.CouponGoodsSku> goodsSkuList = null;
+		List<Coupon.CouponGoodsSku> goodsSkuList = Jsons.parseList(coupon.getGoodsSkuIds(), Coupon.CouponGoodsSku.class);
+		if (goodsSkuList.isEmpty()) {
+			throw BusinessRuntimeException.getInstance("所选规格不存在");
+		}
 		if (coupon.getType() == Coupon.Type.discount) {
 			if (coupon.getDiscount() == null || (coupon.getDiscount().compareTo(BigDecimal.ZERO) < 0 && coupon.getDiscount().compareTo(BigDecimal.ZERO) > 0)) {
 				throw BusinessRuntimeException.getInstance("请输入正确的折扣");
 			}
 		}
 		if (coupon.getType() == Coupon.Type.reduce) {
-			if (StrUtil.isEmpty(coupon.getGoodsSkuIds())) {
-				throw BusinessRuntimeException.getInstance("立减优惠券,请配置其平台及规格");
-			}
 			if (coupon.getReduceMoney() == null) {
 				throw BusinessRuntimeException.getInstance("请配置其立减金额");
 			}
-			goodsSkuList = Jsons.parseList(coupon.getGoodsSkuIds(), Coupon.CouponGoodsSku.class);
-			if (goodsSkuList.isEmpty()) {
-				throw BusinessRuntimeException.getInstance("所选规格不存在");
-			}
+
 			if (coupon.getGoodsType() == Coupon.GoodsType.virtualGoods) {
 				List<Long> skuIds = goodsSkuList.stream().map(Coupon.CouponGoodsSku::getSkuId).collect(Collectors.toList());
-				skuIds.forEach(skuId->{
+				skuIds.forEach(skuId -> {
 					GoodsDonSku sku = goodsDonSkuMapper.selectOne(Wrappers.lambdaQuery(GoodsDonSku.class).eq(GoodsDonSku::getId, skuId).select(GoodsDonSku::getPrice).last("limit 1"));
 					if (sku == null) {
 						throw BusinessRuntimeException.getInstance("所选规格不存在");
@@ -225,9 +222,9 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 						throw BusinessRuntimeException.getInstance("可减金额必须小于规格金额");
 					}
 				});
-			}else {
+			} else {
 				List<Long> goodsIds = goodsSkuList.stream().map(Coupon.CouponGoodsSku::getGoodsId).collect(Collectors.toList());
-				goodsIds.forEach(goodsId->{
+				goodsIds.forEach(goodsId -> {
 					BigDecimal price = goodsDonMapper.selectMinPriceSkuByGoodsId(goodsId);
 					if (price == null) {
 						throw BusinessRuntimeException.getInstance("实物商品不存在");
@@ -264,7 +261,7 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 			} catch (DuplicateKeyException e) {
 				throw BusinessRuntimeException.getInstance("优惠券名称重复");
 			}
-			goodsSkuList.forEach(goodsSkuId->{
+			goodsSkuList.forEach(goodsSkuId -> {
 				CouponSku couponSku = new CouponSku();
 				couponSku.setCouponId(coupon.getId());
 				couponSku.setGoodsId(goodsSkuId.getGoodsId());
@@ -278,7 +275,7 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 				throw BusinessRuntimeException.getInstance("优惠券名称重复");
 			}
 			couponSkuMapper.deleteRelationSku(coupon.getId());
-			goodsSkuList.forEach(goodsSkuId->{
+			goodsSkuList.forEach(goodsSkuId -> {
 				CouponSku couponSku = new CouponSku();
 				couponSku.setCouponId(coupon.getId());
 				couponSku.setGoodsId(goodsSkuId.getGoodsId());