fix 统一设置店铺比例

netflix-dao/src/main/java/com/cyksj/model/entity/YhShopGoodsRate.java

@@ -14,6 +14,8 @@ import lombok.Setter;
 @SearchBean(tables = "goods_don_shop_price")
 public class YhShopGoodsRate extends BaseEntity{
 
+    private Long goodsId;
+
     private Long skuId;
 
     private Integer rate;

netflix-dao/src/main/java/com/cyksj/model/request/GoodsDonShopRateReq.java

@@ -10,11 +10,14 @@ import java.util.List;
  */
 @Data
 public class GoodsDonShopRateReq {
+    private List<Long> goodsIds;
+
     private Integer rate;
 
     private List<GoodsDonShopRate> list;
     @Data
     public static class GoodsDonShopRate{
+        private Long goodsId;
         private Long skuId;
         private Integer rate;
     }

netflix-service/src/main/java/com/cyksj/service/mange/goods/CmsGoodsDonSpecServiceImpl.java

@@ -260,6 +260,7 @@ public class CmsGoodsDonSpecServiceImpl extends ServiceImpl<GoodsDonSpecMapper,
 			goodsDonSkuMapper.insert(goodsDonSku);
 
 			YhShopGoodsRate yhShopGoodsRate = new YhShopGoodsRate();
+			yhShopGoodsRate.setGoodsId(goodsDonSku.getGoodsId());
 			yhShopGoodsRate.setSkuId(goodsDonSku.getId());
 			yhShopGoodsRateMapper.insert(yhShopGoodsRate);
 		}

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -601,6 +601,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			if (order.getMoney().compareTo(BigDecimal.ZERO) > 0 && order.getIsDistribute()) {
 				TASK_POOL.execute(() -> distributeWaitingSendPointsRecord(order));
 			}
+			if (order.getYhsId() != null && order.getYhsId() > 0) {
+				TASK_POOL.execute(() -> yhShopDistributeWaitingSendPointsRecord(order));
+			}
 			if (goodsDon.getType() == 1) {
 				//无车队,新增车队
 				checkNoGroupsTripsAndSendMsg(sku, order);
@@ -648,6 +651,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		}
 	}
 
+	private void yhShopDistributeWaitingSendPointsRecord(OrderDon order) {
+
+	}
+
 	@Override
 	public List<RealGoodsInterestUser> selectNoPaymentRealGoods() {
 		return orderDonMapper.selectNoPaymentRealGoods();

netflix-service/src/main/java/com/cyksj/service/yhShop/YhShopDistributeService.java

@@ -0,0 +1,10 @@
+package com.cyksj.service.yhShop;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopDistributeService
+ *创建者: JavaZou
+ *创建时间:2023/9/19 17:05
+ */
+public interface YhShopDistributeService {
+}

netflix-service/src/main/java/com/cyksj/service/yhShop/YhShopDistributeServiceImpl.java

@@ -0,0 +1,13 @@
+package com.cyksj.service.yhShop;
+
+import org.springframework.stereotype.Service;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopDistributeServiceImpl
+ *创建者: JavaZou
+ *创建时间:2023/9/19 17:05
+ */
+@Service
+public class YhShopDistributeServiceImpl implements YhShopDistributeService{
+}

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsYhShopGoodsController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.annotation.NoSubmit;
 import com.cyksj.common.constant.Constant;
+import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.UserMapper;
@@ -91,6 +92,20 @@ public class CmsYhShopGoodsController {
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }
 
+    /**
+     * 设置店铺平台通用比例
+     */
+    @PutMapping("/set/shop/goods/general/rate")
+    public Result<Void> setShopGoodsGeneralRate(@RequestBody GoodsDonShopRateReq req) {
+        Integer rate = req.getRate();
+        if (rate == null) {
+            throw BusinessRuntimeException.getInstance("请输入正确的比例");
+        }
+        List<Long> goodsIds = req.getGoodsIds();
+        yhShopGoodsRateService.update(Wrappers.lambdaUpdate(YhShopGoodsRate.class).in(YhShopGoodsRate::getGoodsId, goodsIds).set(YhShopGoodsRate::getRate, rate));
+        return GatewayResponse.SUCCESS.newBuilder().toResult();
+    }
+
     /**
      * 店铺通用平台分销比例配置
      */