feat: 素材佣金

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/commission/CommissionManager.java

@@ -7,6 +7,7 @@ import com.gic.haoban.commission.api.qdto.commissiondetail.CommissionSettleOrder
 import com.gic.haoban.commission.api.qdto.commissiondetail.CommissionSettleOrderQDTO;
 import com.gic.haoban.commission.api.service.local.CommissionSettleDetailApiService;
 import com.gic.haoban.manage.web.controller.goods.GoodsInfoAdaptor;
+import com.gic.store.goods.dto.goods.GoodsSpuInfoDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
@@ -55,19 +56,20 @@ public class CommissionManager {
             log.info("查询商品佣金异常 参数缺失 storeId:{} clerkID:{}", storeId, clerkId);
             return Collections.emptyMap();
         }
-        Map<String, BigDecimal> minPriceMap = goodsInfoAdaptor.queryGoodsMinPrice(enterpriseId, goodsIds);
+        Map<String, GoodsSpuInfoDTO> minPriceMap = goodsInfoAdaptor.queryGoodsMinPrice(enterpriseId, goodsIds);
         if (MapUtils.isEmpty(minPriceMap)) {
             log.info("计算商品佣金 参数异常");
             return Collections.emptyMap();
         }
         List<CommissionSettleOrderItemQDTO> settleOrderItems = new ArrayList<>();
-        for (Map.Entry<String, BigDecimal> entry : minPriceMap.entrySet()) {
+        for (Map.Entry<String, GoodsSpuInfoDTO> entry : minPriceMap.entrySet()) {
             String goodsId = entry.getKey();
-            BigDecimal minPrice = entry.getValue();
+            GoodsSpuInfoDTO goodsSpuInfoDTO = entry.getValue();
             CommissionSettleOrderItemQDTO commissionSettleOrderItemQDTO = new CommissionSettleOrderItemQDTO();
             commissionSettleOrderItemQDTO.setGoodsId(goodsId);
+            commissionSettleOrderItemQDTO.setGoodsCode(goodsSpuInfoDTO.getGoodsCode());
             commissionSettleOrderItemQDTO.setGoodsNum(1);
-            commissionSettleOrderItemQDTO.setGoodsPayAmount(minPrice.doubleValue());
+            commissionSettleOrderItemQDTO.setGoodsPayAmount(goodsSpuInfoDTO.getMinPrice().doubleValue());
             settleOrderItems.add(commissionSettleOrderItemQDTO);
         }
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/goods/GoodsInfoAdaptor.java

@@ -5,7 +5,6 @@ import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.app.aggregation.api.dto.GoodsSettingDTO;
 import com.gic.haoban.app.aggregation.api.service.SettingApiService;
-import com.gic.haoban.manage.web.qo.content.ContentMaterialQO;
 import com.gic.store.goods.dto.goods.GoodsSpuInfoDTO;
 import com.gic.store.goods.dto.qdto.GoodsListQDTO;
 import com.gic.store.goods.service.GoodsCenterApiService;
@@ -17,11 +16,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -113,7 +112,7 @@ public class GoodsInfoAdaptor {
      * @param goodsIds
      * @return
      */
-    public Map<String, BigDecimal> queryGoodsMinPrice(String enterpriseId, List<String> goodsIds) {
+    public Map<String, GoodsSpuInfoDTO> queryGoodsMinPrice(String enterpriseId, List<String> goodsIds) {
 
         if (org.springframework.util.CollectionUtils.isEmpty(goodsIds)) {
             return Collections.emptyMap();
@@ -126,6 +125,6 @@ public class GoodsInfoAdaptor {
         return serviceResponse
                 .getResult()
                 .stream()
-                .collect(Collectors.toMap(GoodsSpuInfoDTO::getGoodsId, GoodsSpuInfoDTO::getMinPrice));
+                .collect(Collectors.toMap(GoodsSpuInfoDTO::getGoodsId, Function.identity()));
     }
 }