1.修改退款逻辑

2.修改临时促销活动不允许多个同时存在逻辑

kmall-admin/src/main/java/com/kmall/admin/dao/MkActivitiesCouponDao.java

@@ -19,7 +19,7 @@ public interface MkActivitiesCouponDao extends BaseDao<MkActivitiesCouponEntity>
      * @param prodBarcode
      * @return
      */
-    MkActivitiesCouponEntity queryByBarCode(@Param("mkaId") Long mkaId,
+    MkActivitiesCouponEntity queryByBarCode(@Param("mkaId") String mkaId,
                                             @Param("prodBarcode") String prodBarcode
                                             , @Param("currentTime") String currentTime);
 

kmall-admin/src/main/java/com/kmall/admin/dao/MkActivitiesDiscountDao.java

@@ -21,5 +21,5 @@ public interface MkActivitiesDiscountDao extends BaseDao<MkActivitiesDiscountEnt
      * @param prodBarcode
      * @return
      */
-    MkActivitiesDiscountEntity queryByBarCode(@Param("mkaId") Long mkaId, @Param("prodBarcode") String prodBarcode);
+    MkActivitiesDiscountEntity queryByBarCode(@Param("mkaId") String mkaId, @Param("prodBarcode") String prodBarcode);
 }

kmall-admin/src/main/java/com/kmall/admin/dao/MkActivitiesFullGiftDao.java

@@ -22,7 +22,7 @@ public interface MkActivitiesFullGiftDao extends BaseDao<MkActivitiesFullGiftEnt
      * @param nowTime
      * @return
      */
-    MkActivitiesFullGiftEntity queryByCodeOrBrand(@Param("mkaId") Long mkaId,
+    MkActivitiesFullGiftEntity queryByCodeOrBrand(@Param("mkaId") String mkaId,
                                                   @Param("prodBarcode") String prodBarcode,
                                                   @Param("brandName") String brandName,
                                                   @Param("nowTime") String nowTime);

kmall-admin/src/main/java/com/kmall/admin/dao/MkActivitiesFullReductionDao.java

@@ -21,7 +21,7 @@ public interface MkActivitiesFullReductionDao extends BaseDao<MkActivitiesFullRe
      * @param brandName
      * @return
      */
-    MkActivitiesFullReductionEntity queryByCodeOrBrand(@Param("mkaId") Long mkaId,
+    MkActivitiesFullReductionEntity queryByCodeOrBrand(@Param("mkaId") String mkaId,
                                                        @Param("prodBarcode") String prodBarcode,
                                                        @Param("brandName") String brandName,
                                                        @Param("deadline") String deadline);

kmall-admin/src/main/java/com/kmall/admin/dao/MkActivitiesGetOneFreeGoodsDao.java

@@ -22,7 +22,7 @@ public interface MkActivitiesGetOneFreeGoodsDao extends BaseDao<MkActivitiesGetO
      * @param brandName
      * @return
      */
-    MkActivitiesGetOneFreeGoodsEntity queryByCodeOrBrand(@Param("mkaId") Long mkaId,
+    MkActivitiesGetOneFreeGoodsEntity queryByCodeOrBrand(@Param("mkaId") String mkaId,
                                                          @Param("prodBarcode") String prodBarcode,
                                                          @Param("brandName") String brandName);
 }

kmall-admin/src/main/java/com/kmall/admin/dao/MkActivitiesHalfPriceDao.java

@@ -1,7 +1,6 @@
 package com.kmall.admin.dao;
 
 
-import com.kmall.admin.entity.MkActivitiesFullReductionEntity;
 import com.kmall.admin.entity.MkActivitiesHalfPriceEntity;
 import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
@@ -17,11 +16,11 @@ public interface MkActivitiesHalfPriceDao extends BaseDao<MkActivitiesHalfPriceE
 
     /**
      * 根据品牌或条形码查询是否有对应的满减活动
+     * @param brandName
      * @param mkaId
      * @param prodBarcode
-     * @param brandName
      * @return
      */
-    MkActivitiesHalfPriceEntity queryByCodeOrBrand(@Param("mkaId") Long mkaId,
+    MkActivitiesHalfPriceEntity queryByCodeOrBrand(@Param("mkaId") String mkaId,
                                                        @Param("prodBarcode") String prodBarcode);
 }

kmall-admin/src/main/java/com/kmall/admin/dao/MkActivitiesPromotionDao.java

@@ -20,6 +20,6 @@ public interface MkActivitiesPromotionDao extends BaseDao<MkActivitiesPromotionE
      * @param prodBarcode
      * @return
      */
-    MkActivitiesPromotionEntity queryByBarCode(@Param("mkaId") Long mkaId,
+    MkActivitiesPromotionEntity queryByBarCode(@Param("mkaId") String mkaId,
                                                @Param("prodBarcode") String prodBarcode);
 }

kmall-admin/src/main/java/com/kmall/admin/dao/MkDailyActivitiesDao.java

@@ -20,6 +20,6 @@ public interface MkDailyActivitiesDao extends BaseDao<MkDailyActivitiesEntity> {
      * @param prodBarcode
      * @return
      */
-    MkDailyActivitiesEntity queryByBarCode(@Param("mkaId") Long mkaId,
+    MkDailyActivitiesEntity queryByBarCode(@Param("mkaId") String mkaId,
                                            @Param("prodBarcode") String prodBarcode);
 }

kmall-admin/src/main/java/com/kmall/admin/service/MkActivitiesCouponService.java

@@ -1,7 +1,6 @@
 package com.kmall.admin.service;
 
 import com.kmall.admin.dto.CouponMerchandiseDto;
-import com.kmall.admin.dto.DailyPriceGoodsDto;
 import com.kmall.admin.entity.MkActivitiesCouponEntity;
 
 import java.util.List;
@@ -86,7 +85,7 @@ public interface MkActivitiesCouponService {
      * @param prodBarcode
      * @return
      */
-    MkActivitiesCouponEntity queryByBarCode(Long mkaId, String prodBarcode,String currentTime);
+    MkActivitiesCouponEntity queryByBarCode(String mkaId, String prodBarcode, String currentTime);
 
     MkActivitiesCouponEntity queryByCouponSn(String couponSn,String currentTime);
 }

kmall-admin/src/main/java/com/kmall/admin/service/MkActivitiesDiscountService.java

@@ -1,6 +1,5 @@
 package com.kmall.admin.service;
 
-import com.kmall.admin.dto.DailyPriceGoodsDto;
 import com.kmall.admin.dto.DiscountedProductsDto;
 import com.kmall.admin.entity.MkActivitiesDiscountEntity;
 
@@ -86,5 +85,5 @@ public interface MkActivitiesDiscountService {
      * @param prodBarcode
      * @return
      */
-    MkActivitiesDiscountEntity queryByBarCode(Long mkaId, String prodBarcode);
+    MkActivitiesDiscountEntity queryByBarCode(String mkaId, String prodBarcode);
 }

kmall-admin/src/main/java/com/kmall/admin/service/MkActivitiesFullGiftService.java

@@ -1,6 +1,5 @@
 package com.kmall.admin.service;
 
-import com.kmall.admin.dto.DailyPriceGoodsDto;
 import com.kmall.admin.dto.FreeGoodsDto;
 import com.kmall.admin.entity.MkActivitiesFullGiftEntity;
 
@@ -89,5 +88,5 @@ public interface MkActivitiesFullGiftService {
      * @param nowTime
      * @return
      */
-    MkActivitiesFullGiftEntity queryByCodeOrBrand(Long mkaId, String prodBarcode, String brandName, String nowTime);
+    MkActivitiesFullGiftEntity queryByCodeOrBrand(String mkaId, String prodBarcode, String brandName, String nowTime);
 }

kmall-admin/src/main/java/com/kmall/admin/service/MkActivitiesFullReductionService.java

@@ -1,6 +1,5 @@
 package com.kmall.admin.service;
 
-import com.kmall.admin.dto.DailyPriceGoodsDto;
 import com.kmall.admin.dto.FullReductionDto;
 import com.kmall.admin.entity.MkActivitiesFullReductionEntity;
 
@@ -88,5 +87,5 @@ public interface MkActivitiesFullReductionService {
      * @param deadline
      * @return
      */
-    MkActivitiesFullReductionEntity queryByCodeOrBrand(Long mkaId, String prodBarcode, String brandName,String deadline);
+    MkActivitiesFullReductionEntity queryByCodeOrBrand(String mkaId, String prodBarcode, String brandName, String deadline);
 }

kmall-admin/src/main/java/com/kmall/admin/service/MkActivitiesGetOneFreeGoodsService.java

@@ -1,7 +1,6 @@
 package com.kmall.admin.service;
 
 import com.kmall.admin.dto.BuyOneGetOneFreeDto;
-import com.kmall.admin.dto.DailyPriceGoodsDto;
 import com.kmall.admin.entity.MkActivitiesGetOneFreeGoodsEntity;
 
 import java.util.List;
@@ -88,5 +87,5 @@ public interface MkActivitiesGetOneFreeGoodsService {
      * @param brandName
      * @return
      */
-    MkActivitiesGetOneFreeGoodsEntity queryByCodeOrBrand(Long mkaId, String prodBarcode, String brandName);
+    MkActivitiesGetOneFreeGoodsEntity queryByCodeOrBrand(String mkaId, String prodBarcode, String brandName);
 }

kmall-admin/src/main/java/com/kmall/admin/service/MkActivitiesHalfPriceService.java

@@ -85,5 +85,5 @@ public interface MkActivitiesHalfPriceService {
      * @param prodBarcode
      * @return
      */
-    MkActivitiesHalfPriceEntity queryByCodeOrBrand(Long mkaId, String prodBarcode);
+    MkActivitiesHalfPriceEntity queryByCodeOrBrand(String mkaId, String prodBarcode);
 }

kmall-admin/src/main/java/com/kmall/admin/service/MkActivitiesPromotionService.java

@@ -85,5 +85,5 @@ public interface MkActivitiesPromotionService {
      * @param prodBarcode
      * @return
      */
-    MkActivitiesPromotionEntity queryByBarCode(Long mkaId, String prodBarcode);
+    MkActivitiesPromotionEntity queryByBarCode(String mkaId, String prodBarcode);
 }

kmall-admin/src/main/java/com/kmall/admin/service/MkDailyActivitiesService.java

@@ -86,5 +86,5 @@ public interface MkDailyActivitiesService {
      * @param prodBarcode
      * @return
      */
-    MkDailyActivitiesEntity queryByBarCode(Long mkaId, String prodBarcode);
+    MkDailyActivitiesEntity queryByBarCode(String mkaId, String prodBarcode);
 }

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

@@ -1503,11 +1503,15 @@ public class GoodsServiceImpl implements GoodsService {
                 ,getOneFree = false,promotion = false,halfPrice = false;
 
         List<String> topicList = new ArrayList<>(); // 记录有哪些营销活动的topic
-        Map<String,Long> mkaIdMap = new HashMap<>(); // 记录topic跟mkaId的关系
+        Map<String,String> mkaIdMap = new HashMap<>(); // 记录topic跟mkaId的关系
         // 将所有的营销活动新增到list中
         for(MkActivitiesEntity mkActivitiesEntity : mkActivitiesEntityList){
             topicList.add(mkActivitiesEntity.getMkaTopic());
-            mkaIdMap.put(mkActivitiesEntity.getMkaTopic(),mkActivitiesEntity.getMkaId());
+            String mkaId = mkaIdMap.putIfAbsent(mkActivitiesEntity.getMkaTopic(), mkActivitiesEntity.getMkaId()+"");
+            if(StringUtils.isNotEmpty(mkaId)){
+                mkaId = "'"+mkaId + "','" + mkActivitiesEntity.getMkaId()+"'";
+                mkaIdMap.put(mkActivitiesEntity.getMkaTopic(),mkaId);
+            }
         }
         // 判断有哪些营销活动
         if(topicList.contains("zhjsp")) // 组合价
@@ -1549,7 +1553,7 @@ public class GoodsServiceImpl implements GoodsService {
          * TODO
          */
         if(combinationPrice){
-            Long mkaId = mkaIdMap.get("zhjsp");
+            String mkaId = mkaIdMap.get("zhjsp");
             Map<String,Object> param = new HashMap<>();
             param.put("mkaId",mkaId);
             param.put("prodBarcode",prodBarcode);
@@ -1575,7 +1579,7 @@ public class GoodsServiceImpl implements GoodsService {
          */
         Map<String,Object> fullReductionMap = new HashMap<>();
         if(fullReduction){
-            Long mkaId = mkaIdMap.get("mj");
+            String mkaId = mkaIdMap.get("mj");
             MkActivitiesFullReductionEntity fullReductionEntity = fullReductionService.queryByCodeOrBrand(mkaId,prodBarcode,brandName,nowTime);
             if(fullReductionEntity != null) {
                 if(!StringUtils.isNullOrEmpty(fullReductionEntity.getProductBrand())){
@@ -1599,7 +1603,7 @@ public class GoodsServiceImpl implements GoodsService {
          */
         Map<String,Object> fullGiftMap = new HashMap<>();
         if(fullGift){
-            Long mkaId = mkaIdMap.get("mz");
+            String mkaId = mkaIdMap.get("mz");
             MkActivitiesFullGiftEntity giftEntity = fullGiftService.queryByCodeOrBrand(mkaId,prodBarcode,brandName,nowTime);
             if(giftEntity != null) {
                 if(giftEntity.getProductBrand() != null){
@@ -1625,7 +1629,7 @@ public class GoodsServiceImpl implements GoodsService {
          * key 商品条码 value 赠品条码
          */
         if(getOneFree){
-            Long mkaId = mkaIdMap.get("mysy");
+            String mkaId = mkaIdMap.get("mysy");
             MkActivitiesGetOneFreeGoodsEntity getOneFreeGoodsEntity = getOneFreeGoodsService.queryByCodeOrBrand(mkaId,prodBarcode,brandName);
             if(getOneFreeGoodsEntity != null){
                 if("无".equals(getOneFreeGoodsEntity.getProductBrand())){
@@ -1642,7 +1646,7 @@ public class GoodsServiceImpl implements GoodsService {
 
         // 第二份半价
         if(halfPrice){
-            Long mkaId = mkaIdMap.get("drjbj");
+            String mkaId = mkaIdMap.get("drjbj");
             MkActivitiesHalfPriceEntity activitiesHalfPriceEntity = halfPriceService.queryByCodeOrBrand(mkaId,prodBarcode);
             if(activitiesHalfPriceEntity != null){
                 skuActivitiesMap.put("drjbj",activitiesHalfPriceEntity);
@@ -1659,7 +1663,7 @@ public class GoodsServiceImpl implements GoodsService {
          */
 
         if(coupon){
-            Long mkaId = mkaIdMap.get("yhq");
+            String mkaId = mkaIdMap.get("yhq");
             MkActivitiesCouponEntity couponEntity =  couponService.queryByBarCode(mkaId,prodBarcode,nowTime);
             if(couponEntity != null){ // 优惠券码，优惠金额
                 Map<String,Object> returnMap = new HashMap<>();
@@ -1674,7 +1678,7 @@ public class GoodsServiceImpl implements GoodsService {
          */
 
         if(discount){
-            Long mkaId = mkaIdMap.get("dz");
+            String mkaId = mkaIdMap.get("dz");
             MkActivitiesDiscountEntity discountEntity =  discountService.queryByBarCode(mkaId,prodBarcode);
             // TODO 可能会直接替代产品价格
             if (discountEntity != null) {
@@ -1692,7 +1696,7 @@ public class GoodsServiceImpl implements GoodsService {
          * 日常活动跟着条形码走,优先级比临时促销低，但是高于正常价格
          */
         if(daily){
-            Long mkaId = mkaIdMap.get("rchd");
+            String mkaId = mkaIdMap.get("rchd");
             MkDailyActivitiesEntity dailyActivitiesEntity = dailyActivitiesService.queryByBarCode(mkaId,prodBarcode);
             if(dailyActivitiesEntity != null){
                 goods.setActualPaymentAmount(dailyActivitiesEntity.getActivityPrice());
@@ -1710,7 +1714,7 @@ public class GoodsServiceImpl implements GoodsService {
          * 临时促销跟着条形码走,优先级应该最高，所以排到了最下面
          */
         if(promotion){
-            Long mkaId = mkaIdMap.get("lscx");
+            String mkaId = mkaIdMap.get("lscx");
             MkActivitiesPromotionEntity promotionEntity = promotionService.queryByBarCode(mkaId,prodBarcode);
             // 如果该商品存在临时促销，直接替换活动价格
             if(promotionEntity != null){

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

@@ -2,8 +2,6 @@ package com.kmall.admin.service.impl;
 
 import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.dto.CouponMerchandiseDto;
-import com.kmall.admin.dto.DiscountedProductsDto;
-import com.kmall.admin.entity.MkActivitiesDiscountEntity;
 import com.kmall.common.utils.MapBeanUtil;
 import com.kmall.common.utils.R;
 import com.kmall.common.utils.RRException;
@@ -97,7 +95,7 @@ public class MkActivitiesCouponServiceImpl implements MkActivitiesCouponService
                     throw new RRException(r.get("msg").toString());
                 }
 
-                MkActivitiesCouponEntity old = mkActivitiesCouponDao.queryByBarCode(Long.parseLong(mkaId), couponMerchandiseDto.getBarCode(),null);
+                MkActivitiesCouponEntity old = mkActivitiesCouponDao.queryByBarCode(mkaId, couponMerchandiseDto.getBarCode(),null);
                 if(old != null){
                     throw new RRException("该商品已经参与本次活动，商品{"+couponMerchandiseDto.getBarCode()+"}",500);
                 }
@@ -130,7 +128,7 @@ public class MkActivitiesCouponServiceImpl implements MkActivitiesCouponService
      * @return
      */
     @Override
-    public MkActivitiesCouponEntity queryByBarCode(Long mkaId, String prodBarcode,String currentTime) {
+    public MkActivitiesCouponEntity queryByBarCode(String mkaId, String prodBarcode, String currentTime) {
         return mkActivitiesCouponDao.queryByBarCode(mkaId,prodBarcode,currentTime);
     }
 

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

@@ -2,8 +2,6 @@ package com.kmall.admin.service.impl;
 
 import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.dto.DiscountedProductsDto;
-import com.kmall.admin.dto.TemporaryPromotionalItemsDto;
-import com.kmall.admin.entity.MkActivitiesPromotionEntity;
 import com.kmall.common.utils.MapBeanUtil;
 import com.kmall.common.utils.R;
 import com.kmall.common.utils.RRException;
@@ -97,7 +95,7 @@ public class MkActivitiesDiscountServiceImpl implements MkActivitiesDiscountServ
                     throw new RRException(r.get("msg").toString());
                 }
 
-                MkActivitiesDiscountEntity old = mkActivitiesDiscountDao.queryByBarCode(Long.parseLong(mkaId), discountedProductsDto.getBarCode());
+                MkActivitiesDiscountEntity old = mkActivitiesDiscountDao.queryByBarCode(mkaId, discountedProductsDto.getBarCode());
                 if(old != null){
                     throw new RRException("该商品已经参与本次活动，商品{"+discountedProductsDto.getBarCode()+"}",500);
                 }
@@ -128,7 +126,7 @@ public class MkActivitiesDiscountServiceImpl implements MkActivitiesDiscountServ
      * @return
      */
     @Override
-    public MkActivitiesDiscountEntity queryByBarCode(Long mkaId, String prodBarcode) {
+    public MkActivitiesDiscountEntity queryByBarCode(String mkaId, String prodBarcode) {
         return mkActivitiesDiscountDao.queryByBarCode(mkaId,prodBarcode);
     }
 }

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

@@ -3,10 +3,7 @@ package com.kmall.admin.service.impl;
 import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.dao.GoodsDao;
 import com.kmall.admin.dto.FreeGoodsDto;
-import com.kmall.admin.dto.FullReductionDto;
 import com.kmall.admin.entity.GoodsEntity;
-import com.kmall.admin.entity.MkActivitiesCouponEntity;
-import com.kmall.admin.entity.MkActivitiesFullReductionEntity;
 import com.kmall.common.utils.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -150,7 +147,7 @@ public class MkActivitiesFullGiftServiceImpl implements MkActivitiesFullGiftServ
      * @return
      */
     @Override
-    public MkActivitiesFullGiftEntity queryByCodeOrBrand(Long mkaId, String prodBarcode, String brandName, String nowTime) {
+    public MkActivitiesFullGiftEntity queryByCodeOrBrand(String mkaId, String prodBarcode, String brandName, String nowTime) {
         return mkActivitiesFullGiftDao.queryByCodeOrBrand(mkaId,prodBarcode,brandName,nowTime);
     }
 }

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

@@ -2,9 +2,6 @@ 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;
 import com.kmall.common.utils.RRException;
@@ -106,7 +103,7 @@ public class MkActivitiesFullReductionServiceImpl implements MkActivitiesFullRed
                 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);
+                MkActivitiesFullReductionEntity old =  mkActivitiesFullReductionDao.queryByCodeOrBrand(mkaId,fullReductionDto.getBarCode(),fullReductionDto.getBrand(),nowTime);
                 if(old != null){
                     throw new RRException("该商品或者该品牌已经参与本次活动，商品{"+fullReductionDto.getBarCode()+"},品牌,{"+fullReductionDto.getBrand()+"}",500);
                 }
@@ -140,7 +137,7 @@ public class MkActivitiesFullReductionServiceImpl implements MkActivitiesFullRed
      * @return
      */
     @Override
-    public MkActivitiesFullReductionEntity queryByCodeOrBrand(Long mkaId, String prodBarcode, String brandName,String deadline) {
+    public MkActivitiesFullReductionEntity queryByCodeOrBrand(String mkaId, String prodBarcode, String brandName, String deadline) {
         return mkActivitiesFullReductionDao.queryByCodeOrBrand(mkaId,prodBarcode,brandName,deadline);
     }
 }

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

@@ -3,14 +3,11 @@ package com.kmall.admin.service.impl;
 import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.dao.GoodsDao;
 import com.kmall.admin.dto.BuyOneGetOneFreeDto;
-import com.kmall.admin.dto.FreeGoodsDto;
 import com.kmall.admin.entity.GoodsEntity;
-import com.kmall.admin.entity.MkActivitiesFullGiftEntity;
 import com.kmall.common.utils.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -137,7 +134,7 @@ public class MkActivitiesGetOneFreeGoodsServiceImpl implements MkActivitiesGetOn
      * @return
      */
     @Override
-    public MkActivitiesGetOneFreeGoodsEntity queryByCodeOrBrand(Long mkaId, String prodBarcode, String brandName) {
+    public MkActivitiesGetOneFreeGoodsEntity queryByCodeOrBrand(String mkaId, String prodBarcode, String brandName) {
         return mkActivitiesGetOneFreeGoodsDao.queryByCodeOrBrand(mkaId,prodBarcode,brandName);
     }
 }

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

@@ -1,11 +1,9 @@
 package com.kmall.admin.service.impl;
 
 import com.google.common.collect.ImmutableBiMap;
-import com.kmall.admin.dao.MkActivitiesFullReductionDao;
 import com.kmall.admin.dao.MkActivitiesHalfPriceDao;
 import com.kmall.admin.dto.FullReductionDto;
 import com.kmall.admin.entity.MkActivitiesHalfPriceEntity;
-import com.kmall.admin.service.MkActivitiesFullReductionService;
 import com.kmall.admin.service.MkActivitiesHalfPriceService;
 import com.kmall.common.utils.MapBeanUtil;
 import com.kmall.common.utils.R;
@@ -15,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -104,7 +101,7 @@ public class MkActivitiesHalfPriceServiceImpl implements MkActivitiesHalfPriceSe
                 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
                 String nowTime = format.format(new Date());
 
-                MkActivitiesHalfPriceEntity old =  mkActivitiesFullReductionDao.queryByCodeOrBrand(Long.parseLong(mkaId),fullReductionDto.getBarCode());
+                MkActivitiesHalfPriceEntity old =  mkActivitiesFullReductionDao.queryByCodeOrBrand(mkaId,fullReductionDto.getBarCode());
                 if(old != null){
                     throw new RRException("该商品或者该品牌已经参与本次活动，商品{"+fullReductionDto.getBarCode()+"},品牌,{"+fullReductionDto.getBrand()+"}",500);
                 }
@@ -137,7 +134,7 @@ public class MkActivitiesHalfPriceServiceImpl implements MkActivitiesHalfPriceSe
      * @return
      */
     @Override
-    public MkActivitiesHalfPriceEntity queryByCodeOrBrand(Long mkaId, String prodBarcode) {
+    public MkActivitiesHalfPriceEntity queryByCodeOrBrand(String mkaId, String prodBarcode) {
         return mkActivitiesFullReductionDao.queryByCodeOrBrand(mkaId,prodBarcode);
     }
 }

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

@@ -2,7 +2,6 @@ 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;
@@ -96,10 +95,10 @@ public class MkActivitiesPromotionServiceImpl implements MkActivitiesPromotionSe
                     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 old = mkActivitiesPromotionDao.queryByBarCode(mkaId, temporaryPromotionalItemsDto.getBarCode());
+//                if(old != null){
+//                    throw new RRException("该商品已经参与本次活动，商品{"+temporaryPromotionalItemsDto.getBarCode()+"}",500);
+//                }
 
                 // 保存日常活动商品
                 MkActivitiesPromotionEntity mkActivitiesPromotionEntity = new MkActivitiesPromotionEntity();
@@ -128,7 +127,7 @@ public class MkActivitiesPromotionServiceImpl implements MkActivitiesPromotionSe
      * @return
      */
     @Override
-    public MkActivitiesPromotionEntity queryByBarCode(Long mkaId, String prodBarcode) {
+    public MkActivitiesPromotionEntity queryByBarCode(String mkaId, String prodBarcode) {
         return mkActivitiesPromotionDao.queryByBarCode(mkaId,prodBarcode);
     }
 }

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

@@ -2,7 +2,6 @@ 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;
@@ -11,9 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.text.DecimalFormat;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Map;
 
@@ -100,7 +97,7 @@ public class MkDailyActivitiesServiceImpl implements MkDailyActivitiesService {
                     throw new RRException(r.get("msg").toString());
                 }
 
-                MkDailyActivitiesEntity old = mkDailyActivitiesDao.queryByBarCode(Long.parseLong(mkaId), dailyPriceGoodsDto.getBarCode());
+                MkDailyActivitiesEntity old = mkDailyActivitiesDao.queryByBarCode(mkaId, dailyPriceGoodsDto.getBarCode());
                 if(old != null){
                     throw new RRException("该商品已经参与本次活动，商品{"+dailyPriceGoodsDto.getBarCode()+"}",500);
                 }
@@ -131,7 +128,7 @@ public class MkDailyActivitiesServiceImpl implements MkDailyActivitiesService {
      * @return
      */
     @Override
-    public MkDailyActivitiesEntity queryByBarCode(Long mkaId, String prodBarcode) {
+    public MkDailyActivitiesEntity queryByBarCode(String mkaId, String prodBarcode) {
         return mkDailyActivitiesDao.queryByBarCode(mkaId,prodBarcode);
     }
 }

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

@@ -720,7 +720,8 @@ public class OrderServiceImpl implements OrderService {
         List<OrderGoodsEntity> orderGoodsVoList = orderGoodsDao.queryList(map);
         for (OrderGoodsEntity orderGoodsEntity : orderGoodsVoList) {
             ProductStoreRelaEntity storeRelaEntity = productStoreRelaDao
-                    .queryByStoreIdProductId(Long.valueOf(order.getStoreId()),Long.valueOf(orderGoodsEntity.getProductId()));
+                    .queryByGoodsIdAndStoreId(order.getStoreId().longValue(),orderGoodsEntity.getGoodsId().longValue());
+//                    .queryByStoreIdProductId(Long.valueOf(order.getStoreId()),Long.valueOf(orderGoodsEntity.getProductId()));
             if (null == storeRelaEntity || null == storeRelaEntity.getSellVolume()) {
                 storeRelaEntity.setSellVolume(0);
             }

kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/MkActivitiesServiceImpl.java

@@ -55,10 +55,10 @@ public class MkActivitiesServiceImpl implements MkActivitiesService {
         String mkCode = mkActivities.getMkCode();
         String mkaTopic = mkActivities.getMkaTopic();
         String mkaStoreId = mkActivities.getMkaStoreId();
-        MkActivitiesAssociationEntity mkActivitiesAssociationEntity =  mkActivitiesAssociationDao.queryByMkCodeAndTopic(mkCode,mkaTopic,mkaStoreId);
-        if(mkActivitiesAssociationEntity != null){
-            return 0;
-        }
+//        MkActivitiesAssociationEntity mkActivitiesAssociationEntity =  mkActivitiesAssociationDao.queryByMkCodeAndTopic(mkCode,mkaTopic,mkaStoreId);
+//        if(mkActivitiesAssociationEntity != null){
+//            return 0;
+//        }
 
         SysUserEntity user = ShiroUtils.getUserEntity();
 

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

@@ -173,7 +173,7 @@
 			`moder_sn`,
 			`update_time`
 		from mk_activities_promotion
-		where mka_id = #{mkaId}
+		where mka_id in (${mkaId})
 		and barcode = #{prodBarcode}
 	</select>