fix 修改接口路径

netflix-dao/src/main/java/com/cyksj/model/views/ShopGeneralGoodsRateView.java

@@ -15,6 +15,9 @@ import lombok.Setter;
 @Setter
 @SearchBean(tables = "(select * from goods_don where type = 1) g left join yh_shop_general_goods_rate yr on yr.goods_id = g.id")
 public class ShopGeneralGoodsRateView {
+	@DbField("yr.id")
+	private Long id;
+
 	@DbField("g.id")
 	private Long goodsId;
 

netflix-dao/src/main/java/com/cyksj/model/views/YhShopView.java

@@ -52,15 +52,15 @@ public class YhShopView {
 	@DbField("ys.reason")
 	private String reason;
 
-	@DbField("yh.created_time")
-	private Date createdTime;
-
-	@DbField("yh.update_time")
-	private Date updateTime;
-
 	/**
 	 * 分销订单数
 	 */
 	@DbField("select count(*) from distribute_waiting_send_points where shared_id = ys.user_id")
 	private Integer dsOrder;
+
+	@DbField("ys.created_time")
+	private Date createdTime;
+
+	@DbField("ys.update_time")
+	private Date updateTime;
 }

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

@@ -72,7 +72,7 @@ public class CmsYhShopGoodsController {
     /**
      * 获取店铺平台价格
      */
-    @GetMapping("/get/shop/goods")
+    @GetMapping("/get/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.getGoodsId()).build())));
@@ -82,7 +82,7 @@ public class CmsYhShopGoodsController {
     /**
      * 设置店铺平台价格浮动比例
      */
-    @PutMapping("/put/shop/goods/rate")
+    @PutMapping("/put/goods/rate")
     public Result<Void> updShopGoodsRate(@RequestBody GoodsDonShopRateReq req) {
         req.getList().forEach(e -> {
             YhShopGoodsRate one = yhShopGoodsRateService.getOne(Wrappers.lambdaQuery(YhShopGoodsRate.class)
@@ -103,7 +103,7 @@ public class CmsYhShopGoodsController {
     /**
      * 一键设置 店铺平台通用比例
      */
-    @PutMapping("/set/shop/goods/general/rate")
+    @PutMapping("/oneKey/set/goods/rate")
     public Result<Void> setShopGoodsGeneralRate(@RequestBody GoodsDonShopRateReq req) {
         Integer rate = req.getRate();
         if (rate == null || (rate < 0 && rate > 100)) {
@@ -121,9 +121,9 @@ public class CmsYhShopGoodsController {
     }
 
     /**
-     * 设置店铺平台 通用分销比例配置
+     * 设置店铺平台通用 分销比例配置
      */
-    @PutMapping("/set/general/goods/distribute/rate")
+    @PutMapping("/set/distribute/general/goods//rate")
     public Result<String> setGeneralGoodsRate(@RequestBody List<YhShopGeneralGoodsRate> rates) {
         cmsYhShopCommonService.setGeneralGoodsRate(rates);
         return GatewayResponse.SUCCESS.newBuilder().toResult();
@@ -132,7 +132,7 @@ public class CmsYhShopGoodsController {
     /**
      * 通用平台分销比例展示
      */
-    @GetMapping("/get/general/goods/distribute/rate")
+    @GetMapping("/get/distribute/general/goods/rate")
     public Result<List<ShopGeneralGoodsRateView>> getShopGeneralGoodsRate() {
         List<ShopGeneralGoodsRateView> shopGeneralGoodsRateViews = beanSearcher.searchAll(ShopGeneralGoodsRateView.class, MapUtils.builder()
                 .orderBy(ShopGeneralGoodsRateView::getGoodsId).asc()