Merge remote-tracking branch 'origin/1125/wanwenjing' into 1125/wanwenjing

# Conflicts:
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.muyu.common.core.web.domain.BaseEntity;
-import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -71,27 +70,4 @@ public class ActivityTeamInfo extends BaseEntity {
    * 策略ID
    */
   private long strategyId;
-
-  /**
-   * 公共添加模型，转换成添加对象
-   * @param activityTeamInfoAddModel 添加模型
-   * @return 添加对象
-   */
-  public static ActivityTeamInfo addModelBuild(ActivityTeamInfoAddModel activityTeamInfoAddModel){
-    return ActivityTeamInfo.builder()
-            .name(activityTeamInfoAddModel.getName())
-            .productId(activityTeamInfoAddModel.getProductId())
-            .productImage(activityTeamInfoAddModel.getProductImage())
-            .introduction(activityTeamInfoAddModel.getIntroduction())
-            .unit(activityTeamInfoAddModel.getUnit())
-            .imageList(activityTeamInfoAddModel.getImageList())
-            .endTime(activityTeamInfoAddModel.getEndTime())
-            .sort(activityTeamInfoAddModel.getSort())
-            .content(activityTeamInfoAddModel.getContent())
-            .status(activityTeamInfoAddModel.getStatus())
-            .strategyType(activityTeamInfoAddModel.getStrategyType())
-            .strategyId(activityTeamInfoAddModel.getStrategyId())
-            .build();
-  }
-
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java

@@ -3,10 +3,8 @@ package com.muyu.marketing.team.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.ActivityTeamInfo;
-import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
-import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
 
 import java.util.List;
 
@@ -19,15 +17,4 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
      * @return 团购活动列表
      */
     public TableDataInfo<ActivityTeamInfoListModel> query(ActivityTeamInfoListQueryModel activityTeamInfoListQueryModel);
-
-    /**
-     * 通过添加模型，去进行商品拼团活动的操作
-     * @param activityTeamInfoAddModel 团购添加模型
-     */
-    public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel);
-
-    /**
-     * 通过模型，去进行商品平团获得的操作
-     */
-//    public void uodate(ActivityTeamInfoAddModelityTeamInfoUpdModel activityTeamInfoUpdModel);
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java

@@ -4,16 +4,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.ActivityTeamInfo;
-import com.muyu.marketing.domain.model.*;
+import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
+import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel;
+import com.muyu.marketing.domain.model.TeamProductStockModel;
 import com.muyu.marketing.team.mapper.ActivityTeamInfoMapper;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
 import com.muyu.marketing.team.service.ActivityTeamOpenInfoService;
 import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
-import io.jsonwebtoken.lang.Assert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -68,20 +69,4 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         tableDataInfo.setRows(activityTeamInfoListModels);
         return tableDataInfo;
     }
-
-    /**
-     * 通过添加模型，去进行商品拼团活动的操作
-     *
-     * @param activityTeamInfoAddModel 团购添加模型
-     */
-    @Override
-    public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel) {
-        ActivityTeamInfo activityTeamInfo = ActivityTeamInfo.addModelBuild(activityTeamInfoAddModel);
-        Assert.isTrue(this.save(activityTeamInfo),StringUtils.format("团购活动添加失败:[{}]",activityTeamInfoAddModel));
-        List<ActivityTeamProductSkuAddModel> productSkuAddModelList = activityTeamInfoAddModel.getActivityTeamProductSkuAddModelList();
-        productSkuAddModelList.forEach(activityTeamProductSkuAddModel -> activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId()));
-        this.activityTeamProductSkuInfoService.batchSave(productSkuAddModelList);
-    }
-
-
 }