fix

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

@@ -1,7 +1,7 @@
 package com.cyksj.mapper.shop;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cyksj.model.manage.entity.YhShopDistributeWaitingSendPoints;
+import com.cyksj.model.entity.YhShopDistributeWaitingSendPoints;
 
 /*
  *项目名: yhlxj

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

@@ -1,7 +1,7 @@
 package com.cyksj.mapper.shop;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cyksj.model.manage.entity.YhShop;
+import com.cyksj.model.entity.YhShop;
 import com.cyksj.model.views.YhShopDistributeView;
 
 /*

netflix-dao/src/main/java/com/cyksj/model/dto/YhShopInfo.java

@@ -1,6 +1,6 @@
 package com.cyksj.model.dto;
 
-import com.cyksj.model.manage.entity.YhShop;
+import com.cyksj.model.entity.YhShop;
 import lombok.Getter;
 import lombok.Setter;
 

netflix-dao/src/main/java/com/cyksj/model/manage/entity/YhShop.java → netflix-dao/src/main/java/com/cyksj/model/entity/YhShop.java

@@ -1,4 +1,4 @@
-package com.cyksj.model.manage.entity;
+package com.cyksj.model.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -65,6 +65,11 @@ public class YhShop extends BaseEntity {
 	 */
 	private String modifyName;
 
+	/**
+	 * 备注
+	 */
+	private String remark;
+
 	@Getter
 	public enum Status {
 		verify("审核中"),

netflix-dao/src/main/java/com/cyksj/model/manage/entity/YhShopDistributeWaitingSendPoints.java → netflix-dao/src/main/java/com/cyksj/model/entity/YhShopDistributeWaitingSendPoints.java

@@ -1,4 +1,4 @@
-package com.cyksj.model.manage.entity;
+package com.cyksj.model.entity;
 
 import com.cyksj.model.BaseEntity;
 import lombok.Getter;

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

@@ -0,0 +1,25 @@
+package com.cyksj.model.request;
+
+import com.cyksj.model.entity.YhShopUserPlatDistributeRate;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShopUserPlatDistributeRateReq
+ *创建者: JavaZou
+ *创建时间:2023/9/20 17:45
+ */
+@Getter
+@Setter
+public class YhShopUserPlatDistributeRateReq {
+	private Long id;
+
+	private Long businessId;
+
+	private String remark;
+
+	private List<YhShopUserPlatDistributeRate> rates;
+}

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

@@ -1,6 +1,6 @@
 package com.cyksj.model.request;
 
-import com.cyksj.model.manage.entity.YhShop;
+import com.cyksj.model.entity.YhShop;
 import lombok.Getter;
 import lombok.Setter;
 

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

@@ -1,6 +1,6 @@
 package com.cyksj.model.views;
 
-import com.cyksj.model.manage.entity.YhShopDistributeWaitingSendPoints;
+import com.cyksj.model.entity.YhShopDistributeWaitingSendPoints;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;

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

@@ -1,6 +1,6 @@
 package com.cyksj.model.views;
 
-import com.cyksj.model.manage.entity.YhShop;
+import com.cyksj.model.entity.YhShop;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;

netflix-service/src/main/java/com/cyksj/service/cps/shop/YhShopManageServiceImpl.java

@@ -12,7 +12,7 @@ import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.shop.YhShopMapper;
 import com.cyksj.mapper.shop.YhShopWaitingSendPointsMapper;
 import com.cyksj.model.entity.User;
-import com.cyksj.model.manage.entity.YhShop;
+import com.cyksj.model.entity.YhShop;
 import com.cyksj.model.views.YhShopBrokenLineCpsUserWMoneyView;
 import com.cyksj.model.views.YhShopUserWMoneyStatisticsDataView;
 import com.cyksj.redis.RedisService;

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

@@ -3,7 +3,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.manage.entity.YhShop;
+import com.cyksj.model.entity.YhShop;
 import com.cyksj.model.request.DistributeApplyMoneyReq;
 import com.cyksj.model.request.ShopGeneralGoodsRateReq;
 import com.cyksj.model.request.YhShopVerifyReq;

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

@@ -10,7 +10,7 @@ import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.mapper.*;
 import com.cyksj.mapper.shop.YhShopMapper;
 import com.cyksj.model.entity.*;
-import com.cyksj.model.manage.entity.YhShop;
+import com.cyksj.model.entity.YhShop;
 import com.cyksj.model.request.DistributeApplyMoneyReq;
 import com.cyksj.model.request.ShopGeneralGoodsRateReq;
 import com.cyksj.model.request.YhShopVerifyReq;

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

@@ -1,7 +1,7 @@
 package com.cyksj.service.shop;
 
 import com.cyksj.model.dto.YhShopInfo;
-import com.cyksj.model.manage.entity.YhShop;
+import com.cyksj.model.entity.YhShop;
 
 /*
  *项目名: yhlxj

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

@@ -6,12 +6,11 @@ import com.cyksj.mapper.YhShopUserPlatDistributeRateMapper;
 import com.cyksj.mapper.shop.YhShopDistributeWaitingSendPointsMapper;
 import com.cyksj.mapper.shop.YhShopMapper;
 import com.cyksj.mapper.shop.YhShopUserDistributeSharedMapper;
-import com.cyksj.model.entity.DistributeWaitingSendPoints;
 import com.cyksj.model.entity.OrderDon;
 import com.cyksj.model.entity.YhShopUserDistributeShared;
 import com.cyksj.model.entity.YhShopUserPlatDistributeRate;
-import com.cyksj.model.manage.entity.YhShop;
-import com.cyksj.model.manage.entity.YhShopDistributeWaitingSendPoints;
+import com.cyksj.model.entity.YhShop;
+import com.cyksj.model.entity.YhShopDistributeWaitingSendPoints;
 import com.cyksj.service.distribute.UserBusinessFrontService;
 import com.cyksj.service.shop.YhShopDistributeService;
 import com.cyksj.service.user.UserBenefitsService;
@@ -20,7 +19,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.Optional;
 
 /*
  *项目名: yhlxj

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

@@ -10,7 +10,7 @@ import com.cyksj.mapper.manage.distribute.UserDistributeMapper;
 import com.cyksj.mapper.shop.YhShopMapper;
 import com.cyksj.model.dto.YhShopInfo;
 import com.cyksj.model.entity.SysConfig;
-import com.cyksj.model.manage.entity.YhShop;
+import com.cyksj.model.entity.YhShop;
 import com.cyksj.service.shop.YhShopFrontService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

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

@@ -13,11 +13,7 @@ import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.manage.cms.CmsUserMapper;
 import com.cyksj.mapper.shop.YhShopMapper;
 import com.cyksj.model.entity.*;
-import com.cyksj.model.manage.entity.YhShop;
-import com.cyksj.model.request.DistributeApplyMoneyReq;
-import com.cyksj.model.request.GoodsDonShopRateReq;
-import com.cyksj.model.request.ShopGeneralGoodsRateReq;
-import com.cyksj.model.request.YhShopVerifyReq;
+import com.cyksj.model.request.*;
 import com.cyksj.model.views.*;
 import com.cyksj.service.mange.CmsYhShopCommonService;
 import com.cyksj.service.mange.CmsYhShopGoodsRateService;
@@ -41,7 +37,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 
 /**
- * admin/小店店铺/银河后台
+ * admin/小店店铺/银河后台/店铺管理
  * @author zwhui
  * @date 2023/9/14 16:42
  */
@@ -191,12 +187,14 @@ public class CmsYhShopGoodsController {
     /**
      * 店铺关闭
      */
-    @PutMapping("/update/status/{id}")
-    public Result<String> updateShopStatus(@PathVariable Long id) {
-        YhShop yhShop = yhShopMapper.selectById(id);
-        if (yhShop != null) {
-            yhShop.setStatus(!yhShop.getStatus());
-            yhShopMapper.updateById(yhShop);
+    @PutMapping("/update/status")
+    public Result<String> updateShopStatus(@RequestBody YhShop yhShop) {
+        Long id = yhShop.getId();
+        YhShop dbShop = yhShopMapper.selectById(id);
+        if (dbShop != null) {
+            dbShop.setStatus(!yhShop.getStatus());
+            dbShop.setRemark(yhShop.getRemark());
+            yhShopMapper.updateById(dbShop);
         }
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }
@@ -223,7 +221,19 @@ public class CmsYhShopGoodsController {
      * 设置店铺提成比例
      */
     @PutMapping("/set/rate")
-    public Result<String> setYhShopGoodsRate(@RequestBody List<YhShopUserPlatDistributeRate> yhShopUserPlatDistributeRates) {
+    public Result<String> setYhShopGoodsRate(@RequestBody @Validated YhShopUserPlatDistributeRateReq req) {
+        Long businessId = req.getBusinessId();
+        if (businessId != null) {
+            YhShop yhShop = new YhShop();
+            yhShop.setId(req.getId());
+            yhShop.setBusinessId(businessId);
+            yhShop.setRemark(req.getRemark());
+            cmsYhShopCommonService.setYhShopBusiness(yhShop);
+        }
+        List<YhShopUserPlatDistributeRate> yhShopUserPlatDistributeRates = req.getRates();
+        if (CollUtil.isEmpty(yhShopUserPlatDistributeRates)) {
+            throw BusinessRuntimeException.getInstance("请选择店铺用户对应平台比例");
+        }
         cmsYhShopCommonService.setYhShopGoodsRate(yhShopUserPlatDistributeRates);
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }

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

@@ -12,8 +12,8 @@ import com.cyksj.mapper.shop.YhShopMapper;
 import com.cyksj.model.entity.GoodsDon;
 import com.cyksj.model.entity.User;
 import com.cyksj.model.entity.YhShopDistributeMoneyApply;
-import com.cyksj.model.manage.entity.YhShop;
-import com.cyksj.model.manage.entity.YhShopDistributeWaitingSendPoints;
+import com.cyksj.model.entity.YhShop;
+import com.cyksj.model.entity.YhShopDistributeWaitingSendPoints;
 import com.cyksj.model.views.*;
 import com.cyksj.service.cps.shop.YhShopManageService;
 import com.cyksj.web.util.StpYhShopManageUser;

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

@@ -19,7 +19,7 @@ import com.cyksj.model.dto.AuthToken;
 import com.cyksj.model.dto.CpsAuthDto;
 import com.cyksj.model.dto.GzhOAuth2UserInfo;
 import com.cyksj.model.entity.User;
-import com.cyksj.model.manage.entity.YhShop;
+import com.cyksj.model.entity.YhShop;
 import com.cyksj.model.request.LoginReq;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.authorization.AuthorizationService;

netflix-web/src/main/java/com/cyksj/web/controller/user/OpenShopController.java → netflix-web/src/main/java/com/cyksj/web/controller/shop/OpenShopController.java

@@ -1,8 +1,8 @@
-package com.cyksj.web.controller.user;
+package com.cyksj.web.controller.shop;
 
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
-import com.cyksj.model.manage.entity.YhShop;
+import com.cyksj.model.entity.YhShop;
 import com.cyksj.service.shop.YhShopFrontService;
 import com.cyksj.web.util.StpUserUtil;
 import com.ejlchina.searcher.BeanSearcher;
@@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 /*
+ * server/小店店铺/开店申请
  *项目名: yhlxj
  *文件名: OpenShopController
  *创建者: JavaZou