查询价格QO添加用户标签id列表

src/main/java/com/mmc/oms/model/dto/user/UserAccountSimpleDTO.java

 package com.mmc.oms.model.dto.user;
 
+import com.mmc.oms.model.dto.mall.CooperationTagVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -7,6 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Author small
@@ -53,4 +55,6 @@ public class UserAccountSimpleDTO implements Serializable {
     private String companyName;
     @ApiModelProperty(value = "合作标签")
     private String tagName;
+    @ApiModelProperty(value = "用户合作标签")
+    private List<CooperationTagVO> cooperationTagVOS;
 }

src/main/java/com/mmc/oms/model/qo/mall/MallOrderGoodsInfoQO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -22,6 +23,7 @@ public class MallOrderGoodsInfoQO implements Serializable {
     private static final long serialVersionUID = -3807569067697485137L;
     private Integer userAccountId;
     private Integer cooperationTagId;
+    private Set<Integer> cooperationTagIds;
     private Set<Integer> mallProdSkuSpecIds;
     private Set<Integer> mallIndstSkuSpecIds;
 }

src/main/java/com/mmc/oms/service/mall/impl/AppMallOrderServiceImpl.java

@@ -1194,11 +1194,8 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
 
         //返回的结果
         ConfirmGoodsInfoDTO confirmGoodsInfoDTO = new ConfirmGoodsInfoDTO();
-
         //查询商品信息，价格信息
-        MallOrderGoodsInfoQO mallOrderGoodsInfoQO = new MallOrderGoodsInfoQO();
-        mallOrderGoodsInfoQO.setUserAccountId(userAccountSimpleDTO.getId());
-        mallOrderGoodsInfoQO.setCooperationTagId(userAccountSimpleDTO.getCooperationTagId());
+        MallOrderGoodsInfoQO mallOrderGoodsInfoQO = this.generateMallOrderGoodsInfoQO(param, userAccountSimpleDTO);
         //订单金额
         BigDecimal orderAmount = BigDecimal.ZERO;
         //产品sku信息
@@ -1206,12 +1203,8 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
         //处理产品商品
         if(!CollectionUtils.isEmpty(param.getMallSpecIds()) && !param.getDirectoryId().equals(2)){
             confirmGoodsInfoDTO.setDirectoryId(1);
-            //设置查询商品信息的参数，mallProdSkuInfoSpecId
-            mallOrderGoodsInfoQO.setMallProdSkuSpecIds(new HashSet<>());
-            mallOrderGoodsInfoQO.getMallProdSkuSpecIds().addAll(param.getMallSpecIds());
             //查询商品详细信息
             orderGoodsProdDTOList = pmsClient.feignListProdGoodsSkuInfo(mallOrderGoodsInfoQO, token);
-
             //----------------------判空
             if(CollectionUtils.isEmpty(orderGoodsProdDTOList)){
                 return ResultBody.error(ResultEnum.GOODS_VERSION_ERROR);
@@ -1253,32 +1246,41 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
         return ResultBody.success(confirmGoodsInfoDTO);
     }
 
+    public MallOrderGoodsInfoQO generateMallOrderGoodsInfoQO(MallConfirmOrderVO param, UserAccountSimpleDTO userAccountSimpleDTO){
+        MallOrderGoodsInfoQO mallOrderGoodsInfoQO = new MallOrderGoodsInfoQO();
+        mallOrderGoodsInfoQO.setUserAccountId(userAccountSimpleDTO.getId());
+        Set<Integer> cooperationIds = new HashSet<Integer>();
+        if (!CollectionUtils.isEmpty(userAccountSimpleDTO.getCooperationTagVOS())){
+            List<Integer> cooperationTagIds = userAccountSimpleDTO.getCooperationTagVOS().stream().map(CooperationTagVO::getId).collect(Collectors.toList());
+            cooperationIds.addAll(cooperationTagIds);
+        }
+        cooperationIds.add(0);
+        mallOrderGoodsInfoQO.setCooperationTagIds(cooperationIds);
+        //设置查询商品信息的参数，mallProdSkuInfoSpecId
+        mallOrderGoodsInfoQO.setMallProdSkuSpecIds(new HashSet<>());
+        mallOrderGoodsInfoQO.getMallProdSkuSpecIds().addAll(param.getMallSpecIds());
+        return mallOrderGoodsInfoQO;
+    }
+
     @Transactional
     @Override
     public ResultBody commitMallOrder(MallConfirmOrderVO param, BaseAccountDTO currentAccount, String token) {
+        UserAccountSimpleDTO userAccountSimpleDTO = userClient.feignGetUserSimpleInfo(currentAccount.getUserAccountId(), token);
         //查询收货地址
         UserAddressDTO userAddressDTO = userAddressService.getUserAddressInfo(param.getUserAddressId());
         //查询商品信息，价格信息
-        MallOrderGoodsInfoQO mallOrderGoodsInfoQO = new MallOrderGoodsInfoQO();
-        mallOrderGoodsInfoQO.setUserAccountId(currentAccount.getUserAccountId());
-        mallOrderGoodsInfoQO.setCooperationTagId(currentAccount.getUserAccountId());
+        MallOrderGoodsInfoQO mallOrderGoodsInfoQO = this.generateMallOrderGoodsInfoQO(param, userAccountSimpleDTO);
         //订单金额
         BigDecimal orderAmount = BigDecimal.ZERO;
         //推荐人订单总价
         BigDecimal rcdOrderAmount = BigDecimal.ZERO;
         //产品sku信息
         List<OrderGoodsProdDTO> orderGoodsProdDTOList = new ArrayList<>();
-        //生成总订单id
-        SnowFlake snowFlake = new SnowFlake(2, 3);
-        //Long orderId = snowFlake.nextId();
         String orderNo = CodeUtil.uavOrderCode();
         BigDecimal couponDiscount = BigDecimal.ZERO;
 
         //处理产品商品
         if(!CollectionUtils.isEmpty(param.getMallSpecIds()) && !param.getDirectoryId().equals(2)){
-            //设置查询商品信息的参数，mallProdSkuInfoSpecId
-            mallOrderGoodsInfoQO.setMallProdSkuSpecIds(new HashSet<>());
-            mallOrderGoodsInfoQO.getMallProdSkuSpecIds().addAll(param.getMallSpecIds());
             //查询商品详细信息
             orderGoodsProdDTOList = pmsClient.feignListProdGoodsSkuInfo(mallOrderGoodsInfoQO, token);
             //----------------------判空