fix

netflix-dao/src/main/java/com/cyksj/mapper/shop/YhShopGeneralGoodsRateMapper.java

@@ -2,10 +2,6 @@ package com.cyksj.mapper.shop;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cyksj.model.entity.YhShopGeneralGoodsRate;
-import com.cyksj.model.request.ShopGeneralGoodsRateReq;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /*
  *项目名: yhlxj
@@ -14,5 +10,4 @@ import java.util.List;
  *创建时间:2023/9/15 17:35
  */
 public interface YhShopGeneralGoodsRateMapper extends BaseMapper<YhShopGeneralGoodsRate> {
-	void saveOrUpdateBatch(@Param("list") List<ShopGeneralGoodsRateReq> saveShopGoodsRate);
 }

netflix-service/src/main/java/com/cyksj/service/mange/CmsYhShopCommonService.java

@@ -1,11 +1,7 @@
 package com.cyksj.service.mange;
 
-import com.cyksj.model.entity.UserDistributeBusinessRate;
-import com.cyksj.model.entity.YhShopUserBusinessDefaultRateConfig;
-import com.cyksj.model.entity.YhShopUserPlatDistributeRate;
-import com.cyksj.model.entity.YhShop;
+import com.cyksj.model.entity.*;
 import com.cyksj.model.request.DistributeApplyMoneyReq;
-import com.cyksj.model.request.ShopGeneralGoodsRateReq;
 import com.cyksj.model.request.YhShopVerifyReq;
 
 import java.util.List;
@@ -17,7 +13,7 @@ import java.util.List;
  *创建时间:2023/9/15 17:26
  */
 public interface CmsYhShopCommonService {
-	void setGeneralGoodsRate(List<ShopGeneralGoodsRateReq> rates);
+	void setGeneralGoodsRate(List<YhShopGeneralGoodsRate> rates);
 
 	void verifyYhShopApply(YhShopVerifyReq verifyReq);
 

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

@@ -11,11 +11,11 @@ import com.cyksj.mapper.GoodsDonMapper;
 import com.cyksj.mapper.shop.*;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.request.DistributeApplyMoneyReq;
-import com.cyksj.model.request.ShopGeneralGoodsRateReq;
 import com.cyksj.model.request.YhShopVerifyReq;
 import com.cyksj.model.views.GoodsDonSkuView;
 import com.cyksj.service.mange.CmsYhShopCommonService;
 import com.cyksj.service.mange.business.UserBusinessRateService;
+import com.cyksj.service.shop.YhShopGeneralGoodsRateService;
 import com.cyksj.service.shop.YhShopUserPlatDistributeRateService;
 import com.cyksj.service.user.UserBenefitsService;
 import com.ejlchina.searcher.BeanSearcher;
@@ -44,7 +44,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 public class CmsYhShopCommonServiceImpl implements CmsYhShopCommonService {
 	private final GoodsDonMapper goodsDonMapper;
 
-	private final YhShopGeneralGoodsRateMapper yhShopGeneralGoodsRateMapper;
+	private final YhShopGeneralGoodsRateService yhShopGeneralGoodsRateService;
 
 	private final YhShopMapper yhShopMapper;
 
@@ -65,8 +65,8 @@ public class CmsYhShopCommonServiceImpl implements CmsYhShopCommonService {
 	private final BeanSearcher beanSearcher;
 
 	@Override
-	public void setGeneralGoodsRate(List<ShopGeneralGoodsRateReq> rates) {
-		List<ShopGeneralGoodsRateReq> saveShopGoodsRate = new ArrayList<>(rates.size());
+	public void setGeneralGoodsRate(List<YhShopGeneralGoodsRate> rates) {
+		List<YhShopGeneralGoodsRate> saveShopGoodsRate = new ArrayList<>(rates.size());
 		rates.forEach(data -> {
 			Integer rate = data.getRate();
 			Long goodsId = data.getGoodsId();
@@ -79,7 +79,7 @@ public class CmsYhShopCommonServiceImpl implements CmsYhShopCommonService {
 		});
 
 		if (CollUtil.isNotEmpty(saveShopGoodsRate)) {
-			yhShopGeneralGoodsRateMapper.saveOrUpdateBatch(saveShopGoodsRate);
+			yhShopGeneralGoodsRateService.saveOrUpdateBatch(saveShopGoodsRate);
 		}
 	}
 

netflix-service/src/main/java/com/cyksj/service/shop/YhShopGeneralGoodsRateService.java

@@ -0,0 +1,13 @@
+package com.cyksj.service.shop;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.cyksj.model.entity.YhShopGeneralGoodsRate;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopGeneralGoodsRateService
+ *创建者: JavaZou
+ *创建时间:2023/9/21 17:06
+ */
+public interface YhShopGeneralGoodsRateService extends IService<YhShopGeneralGoodsRate> {
+}

netflix-service/src/main/java/com/cyksj/service/shop/impl/YhShopGeneralGoodsRateServiceIImpl.java

@@ -0,0 +1,20 @@
+package com.cyksj.service.shop.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cyksj.mapper.shop.YhShopGeneralGoodsRateMapper;
+import com.cyksj.model.entity.YhShopGeneralGoodsRate;
+import com.cyksj.service.shop.YhShopGeneralGoodsRateService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopGeneralGoodsRateServiceIImpl
+ *创建者: JavaZou
+ *创建时间:2023/9/21 17:06
+ */
+
+@Service
+@RequiredArgsConstructor
+public class YhShopGeneralGoodsRateServiceIImpl extends ServiceImpl<YhShopGeneralGoodsRateMapper, YhShopGeneralGoodsRate> implements YhShopGeneralGoodsRateService {
+}

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

@@ -75,7 +75,7 @@ public class CmsYhShopGoodsController {
     @GetMapping("/get/shop/goods")
     public Result<SearchResult<YhShopGoodsRateView>> shopGoodsList(){
         SearchResult<YhShopGoodsRateView> search = beanSearcher.search(YhShopGoodsRateView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
-        search.getDataList().forEach(e -> e.setList(beanSearcher.searchList(YhShopGoodsRateView.YhShopGoodsSkuRateView.class,MapUtils.builder().field(YhShopGoodsRateView.YhShopGoodsSkuRateView::getGoodsId,e.getId()).build())));
+        search.getDataList().forEach(e -> e.setList(beanSearcher.searchList(YhShopGoodsRateView.YhShopGoodsSkuRateView.class,MapUtils.builder().field(YhShopGoodsRateView.YhShopGoodsSkuRateView::getGoodsId,e.getGoodsId()).build())));
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }
 
@@ -101,7 +101,7 @@ public class CmsYhShopGoodsController {
     }
 
     /**
-     * 设置店铺平台通用比例
+     * 一键设置 店铺平台通用比例
      */
     @PutMapping("/set/shop/goods/general/rate")
     public Result<Void> setShopGoodsGeneralRate(@RequestBody GoodsDonShopRateReq req) {
@@ -121,10 +121,10 @@ public class CmsYhShopGoodsController {
     }
 
     /**
-     * 店铺通用平台分销比例配置
+     * 设置店铺平台 通用分销比例配置
      */
     @PutMapping("/set/general/goods/distribute/rate")
-    public Result<String> setGeneralGoodsRate(@RequestBody List<ShopGeneralGoodsRateReq> rates) {
+    public Result<String> setGeneralGoodsRate(@RequestBody List<YhShopGeneralGoodsRate> rates) {
         cmsYhShopCommonService.setGeneralGoodsRate(rates);
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }