查询活动时增加商品菜单渠道字段,用于促销判断赠送商品状态

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityQueryRequestDto.java

 package cn.freemud.entities.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.NotNull;
@@ -110,6 +111,12 @@ public class ActivityQueryRequestDto {
      */
     private Integer isShowStore;
 
+    /**
+     * 商品渠道 查询商品信息时用
+     * saas-自提 saasdelivery-外卖  saasmall-微商城 ....
+     */
+    @ApiModelProperty(value = "商品渠道 saas(开个店自提)、saasdelivery（开个店外卖）、saasmall（微商城）、wc（围餐）、mtwm（美团外卖）、jdwm（京东外卖）、fmwd（非码微店）、eleme（饿了么外卖）、ebwm（饿百外卖） 有换购或者赠送商品的活动时必传")
+    private String productChannel;
 
 
     private List<QueryGoodsBeanDto> goods;

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ActivityServiceImpl.java

@@ -19,10 +19,12 @@ import cn.freemud.entities.dto.activity.ActivityQueryDto;
 import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
 import cn.freemud.enums.ActivityChannelEnum;
 import cn.freemud.enums.ActivityTypeEnum;
+import cn.freemud.enums.CreateOrderType;
 import cn.freemud.service.ActivityService;
 import cn.freemud.service.CommonService;
 import cn.freemud.service.thirdparty.ActivityClient;
 import cn.freemud.utils.PropertyConvertUtil;
+import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -115,6 +117,13 @@ public class ActivityServiceImpl implements ActivityService {
         activityQueryRequestDto.setIsShowStore(0);
         activityQueryRequestDto.setIsShowTime(0);
         activityQueryRequestDto.setOrgIds(commonService.getOrgIds(activityQueryDto.getPartnerId(), activityQueryDto.getStoreId()));
+        if (Objects.equals(activityQueryDto.getOrderType(), CreateOrderType.COLLECT_GOODS.getCode())) {
+            activityQueryRequestDto.setProductChannel(BusinessTypeEnum.SAAS_PICKUP.getCode());
+        } else if (Objects.equals(activityQueryDto.getOrderType(), CreateOrderType.TAKE_OUT.getCode())) {
+            activityQueryRequestDto.setProductChannel(BusinessTypeEnum.SAAS_DELIVERY.getCode());
+        } else if (Objects.equals(activityQueryDto.getOrderType(), CreateOrderType.SAASMALL.getCode())) {
+            activityQueryRequestDto.setProductChannel(BusinessTypeEnum.SAAS_MALL.getCode());
+        }
         ActivityQueryResponseDto activityQueryResponseDto = null;
         try {
             activityQueryResponseDto = activityClient.query(activityQueryRequestDto);