修复BUG

kmall-admin/src/main/java/com/kmall/admin/service/impl/MkActivitiesCouponServiceImpl.java

@@ -96,6 +96,13 @@ public class MkActivitiesCouponServiceImpl implements MkActivitiesCouponService
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
                     throw new RRException(r.get("msg").toString());
                 }
+
+                MkActivitiesCouponEntity old = mkActivitiesCouponDao.queryByBarCode(Long.parseLong(mkaId), couponMerchandiseDto.getBarCode());
+                if(old != null){
+                    throw new RRException("该商品已经参与本次活动，商品{"+couponMerchandiseDto.getBarCode()+"}",500);
+                }
+
+
                 // 保存日常活动商品
                 MkActivitiesCouponEntity mkActivitiesCouponEntity = new MkActivitiesCouponEntity();
                 mkActivitiesCouponEntity.setCouponSn(couponMerchandiseDto.getCouponSn()); // 商品名称

kmall-admin/src/main/java/com/kmall/admin/service/impl/MkActivitiesDiscountServiceImpl.java

@@ -96,6 +96,12 @@ public class MkActivitiesDiscountServiceImpl implements MkActivitiesDiscountServ
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
                     throw new RRException(r.get("msg").toString());
                 }
+
+                MkActivitiesDiscountEntity old = mkActivitiesDiscountDao.queryByBarCode(Long.parseLong(mkaId), discountedProductsDto.getBarCode());
+                if(old != null){
+                    throw new RRException("该商品已经参与本次活动，商品{"+discountedProductsDto.getBarCode()+"}",500);
+                }
+
                 // 保存日常活动商品
                 MkActivitiesDiscountEntity mkActivitiesDiscountEntity = new MkActivitiesDiscountEntity();
                 mkActivitiesDiscountEntity.setProductName(discountedProductsDto.getGoodsName()); // 商品名称

kmall-admin/src/main/java/com/kmall/admin/service/impl/MkActivitiesFullGiftServiceImpl.java

@@ -3,6 +3,7 @@ package com.kmall.admin.service.impl;
 import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.dto.FreeGoodsDto;
 import com.kmall.admin.dto.FullReductionDto;
+import com.kmall.admin.entity.MkActivitiesCouponEntity;
 import com.kmall.admin.entity.MkActivitiesFullReductionEntity;
 import com.kmall.common.utils.MapBeanUtil;
 import com.kmall.common.utils.R;
@@ -12,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -100,6 +103,14 @@ public class MkActivitiesFullGiftServiceImpl implements MkActivitiesFullGiftServ
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
                     throw new RRException(r.get("msg").toString());
                 }
+                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                String nowTime = format.format(new Date());
+
+                MkActivitiesFullGiftEntity old =  mkActivitiesFullGiftDao.queryByCodeOrBrand(Long.parseLong(mkaId),freeGoodsDto.getBarCode(),freeGoodsDto.getBrand(),nowTime);
+                if(old != null){
+                    throw new RRException("该商品或者该品牌已经参与本次活动，商品{"+freeGoodsDto.getBarCode()+"},品牌,{"+freeGoodsDto.getBrand()+"}",500);
+                }
+
                 // 保存日常活动商品
                 MkActivitiesFullGiftEntity mkActivitiesFullGiftEntity = new MkActivitiesFullGiftEntity();
                 mkActivitiesFullGiftEntity.setQualifiedAmount(new BigDecimal(freeGoodsDto.getFullReductionPrice())); // 满赠达到金额

kmall-admin/src/main/java/com/kmall/admin/service/impl/MkActivitiesFullReductionServiceImpl.java

@@ -3,6 +3,7 @@ package com.kmall.admin.service.impl;
 import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.dto.FullReductionDto;
 import com.kmall.admin.dto.TemporaryPromotionalItemsDto;
+import com.kmall.admin.entity.MkActivitiesFullGiftEntity;
 import com.kmall.admin.entity.MkActivitiesPromotionEntity;
 import com.kmall.common.utils.MapBeanUtil;
 import com.kmall.common.utils.R;
@@ -12,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -99,6 +102,15 @@ public class MkActivitiesFullReductionServiceImpl implements MkActivitiesFullRed
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
                     throw new RRException(r.get("msg").toString());
                 }
+
+                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                String nowTime = format.format(new Date());
+
+                MkActivitiesFullReductionEntity old =  mkActivitiesFullReductionDao.queryByCodeOrBrand(Long.parseLong(mkaId),fullReductionDto.getBarCode(),fullReductionDto.getBrand(),nowTime);
+                if(old != null){
+                    throw new RRException("该商品或者该品牌已经参与本次活动，商品{"+fullReductionDto.getBarCode()+"},品牌,{"+fullReductionDto.getBrand()+"}",500);
+                }
+
                 // 保存日常活动商品
                 MkActivitiesFullReductionEntity mkActivitiesFullReductionEntity = new MkActivitiesFullReductionEntity();
                 mkActivitiesFullReductionEntity.setQualifiedAmount(new BigDecimal(fullReductionDto.getFullReductionPrice())); // 满减达到金额

kmall-admin/src/main/java/com/kmall/admin/service/impl/MkActivitiesGetOneFreeGoodsServiceImpl.java

@@ -98,6 +98,11 @@ public class MkActivitiesGetOneFreeGoodsServiceImpl implements MkActivitiesGetOn
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
                     throw new RRException(r.get("msg").toString());
                 }
+
+                MkActivitiesGetOneFreeGoodsEntity old = mkActivitiesGetOneFreeGoodsDao.queryByCodeOrBrand(Long.parseLong(mkaId), buyOneGetOneFreeDto.getBuyBarCode(), buyOneGetOneFreeDto.getBuyBrand());
+                if(old != null){
+                    throw new RRException("该商品或者该品牌已经参与本次活动，商品{"+buyOneGetOneFreeDto.getBuyBarCode()+"},品牌,{"+buyOneGetOneFreeDto.getBuyBrand()+"}",500);
+                }
                 // 保存日常活动商品
                 MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoodsEntity = new MkActivitiesGetOneFreeGoodsEntity();
                 mkActivitiesGetOneFreeGoodsEntity.setGoodsSn(buyOneGetOneFreeDto.getBuyGoodsSn()); // 商品编号

kmall-admin/src/main/java/com/kmall/admin/service/impl/MkActivitiesPromotionServiceImpl.java

@@ -2,6 +2,7 @@ package com.kmall.admin.service.impl;
 
 import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.dto.TemporaryPromotionalItemsDto;
+import com.kmall.admin.entity.MkActivitiesCouponEntity;
 import com.kmall.common.utils.MapBeanUtil;
 import com.kmall.common.utils.R;
 import com.kmall.common.utils.RRException;
@@ -94,6 +95,12 @@ public class MkActivitiesPromotionServiceImpl implements MkActivitiesPromotionSe
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
                     throw new RRException(r.get("msg").toString());
                 }
+
+                MkActivitiesPromotionEntity old = mkActivitiesPromotionDao.queryByBarCode(Long.parseLong(mkaId), temporaryPromotionalItemsDto.getBarCode());
+                if(old != null){
+                    throw new RRException("该商品已经参与本次活动，商品{"+temporaryPromotionalItemsDto.getBarCode()+"}",500);
+                }
+
                 // 保存日常活动商品
                 MkActivitiesPromotionEntity mkActivitiesPromotionEntity = new MkActivitiesPromotionEntity();
                 mkActivitiesPromotionEntity.setProductName(temporaryPromotionalItemsDto.getGoodsName()); // 商品名称

kmall-admin/src/main/java/com/kmall/admin/service/impl/MkDailyActivitiesServiceImpl.java

@@ -2,6 +2,7 @@ package com.kmall.admin.service.impl;
 
 import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.dto.DailyPriceGoodsDto;
+import com.kmall.admin.entity.MkActivitiesPromotionEntity;
 import com.kmall.common.utils.MapBeanUtil;
 import com.kmall.common.utils.R;
 import com.kmall.common.utils.RRException;
@@ -98,6 +99,11 @@ public class MkDailyActivitiesServiceImpl implements MkDailyActivitiesService {
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
                     throw new RRException(r.get("msg").toString());
                 }
+
+                MkDailyActivitiesEntity old = mkDailyActivitiesDao.queryByBarCode(Long.parseLong(mkaId), dailyPriceGoodsDto.getBarCode());
+                if(old != null){
+                    throw new RRException("该商品已经参与本次活动，商品{"+dailyPriceGoodsDto.getBarCode()+"}",500);
+                }
                 // 保存日常活动商品
                 MkDailyActivitiesEntity mkDailyActivitiesEntity = new MkDailyActivitiesEntity();
                 mkDailyActivitiesEntity.setProductName(dailyPriceGoodsDto.getGoodsName()); // 商品名称

kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesDiscountDao.xml

@@ -89,7 +89,7 @@
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}
 		</if>
-		<if test="mkaId != null'">
+		<if test="mkaId != null">
 			AND mka_id = #{mkaId}
 		</if>
 	</select>