Merge branch 'dev/2024/1112/update-business-Y' of feifan/mall-backend-business into master

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/service/spu/ProductSpuServiceImpl.java

@@ -82,10 +82,18 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         spu.setShopId(userShopDetails.getShopId());
         spu.setMerchantId(userShopDetails.getMerId());
 
+        //最大推广费, 单位: 分
+        Integer maxPromotionFee = 0;
+
         for (ProductSkuSaveReqVO productSkuSaveReqVO : skuSaveReqList) {
             productSkuSaveReqVO.setShopId(userShopDetails.getShopId());
             productSkuSaveReqVO.setMerchantId(userShopDetails.getMerId());
+
+            Integer skuPromotionFee = productSkuSaveReqVO.getPromotionFee();
+            if(skuPromotionFee>maxPromotionFee)
+                maxPromotionFee=skuPromotionFee;
         }
+        spu.setPromotionFee(maxPromotionFee);
 
         // 插入 SPU
         productSpuMapper.insert(spu);

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/service/spuapply/SpuApplyServiceImpl.java

@@ -96,12 +96,19 @@ public class SpuApplyServiceImpl implements SpuApplyService {
         spuApply.setShopId(userShopDetails.getShopId());
         spuApply.setMerchantId(userShopDetails.getMerId());
 
+        //最大推广费, 单位: 分
+        Integer maxPromotionFee = 0;
         for (SkuApplySaveReqVO productSkuSaveReqVO : skuSaveReqList) {
             productSkuSaveReqVO.setShopId(userShopDetails.getShopId());
             productSkuSaveReqVO.setMerchantId(userShopDetails.getMerId());
+
+            Integer skuPromotionFee = productSkuSaveReqVO.getPromotionFee();
+            if(skuPromotionFee>maxPromotionFee)
+                maxPromotionFee=skuPromotionFee;
         }
 
         spuApply.setApplyMemberUserId(getLoginUserId());
+        spuApply.setPromotionFee(maxPromotionFee);
         // 插入 SPU
         spuApplyMapper.insert(spuApply);
         // 插入 SKU