修改优惠方式

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/ActivityUtil.java

@@ -119,8 +119,8 @@ public class ActivityUtil {
             return;
         }
         Promotions promotions = promotionsService.getPromotionsListByTime();
+        this.getColorSpikePriv(cartDtoList,promotions); //必须要先执行秒杀，否则秒杀与赠品想冲突
         this.giftCartPriv(cartDtoList,promotions);
-        this.getColorSpikePriv(cartDtoList,promotions);
     }
 
     /**