解决谁的代码合并错误

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

@@ -21,7 +21,6 @@ import cn.freemud.entities.dto.promotion.CalculationDiscountGoodsDto;
 import cn.freemud.entities.dto.promotion.CalculationDiscountRequestDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
-import cn.freemud.enums.integralproduct.IntegralProductStatusEnum;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.manager.BuyProductOnceManager;
 import cn.freemud.redis.RedisCache;
@@ -61,9 +60,6 @@ import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
-import com.freemud.application.sdk.api.productcenter.request.product.GetProductInfoRequest;
-import com.freemud.application.sdk.api.productcenter.response.menu.GetMenuCategoryInfoResponse;
-import com.freemud.application.sdk.api.productcenter.response.product.GetProductInfosResponse;
 import com.freemud.application.sdk.api.productcenter.service.MenuService;
 import com.freemud.application.sdk.api.promotioncenter.request.promotion.ActivityUpdateStockRequest;
 import com.freemud.application.sdk.api.promotioncenter.response.PromotionResponseDTO;
@@ -81,7 +77,6 @@ import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
 import com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
 import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -534,6 +529,9 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         if (CollectionUtils.isEmpty(productBindingCoupons)) {
             return ResponseUtil.error(ResponseResult.STORE_ITEM_CHECK_INVAILD);
         }
+        for (ProductBindingCouponType productBindingCouponType : productBindingCoupons) {
+            activityCodes.add(productBindingCouponType.getActivityCode());
+        }
         //批量查询活动详情
         List<ActiveDetailVO> activeDetailVOS = batchQueryActivityInfo(partnerId, activityCodes, trackingNo);
         if (CollectionUtils.isEmpty(activeDetailVOS) || activityCodes.size() != activeDetailVOS.size()) {