分销更名 全民股东

新增全民股东群聊配置

cash-api/market-server/src/main/java/com/czg/controller/admin/ADisGroupController.java

@@ -0,0 +1,47 @@
+package com.czg.controller.admin;
+
+import com.czg.annotation.SaAdminCheckPermission;
+import com.czg.market.entity.MkDistributionGroup;
+import com.czg.market.service.MkDistributionGroupService;
+import com.czg.resp.CzgResult;
+import com.czg.sa.StpKit;
+import jakarta.annotation.Resource;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * 全民股东群聊
+ *
+ * @author ww
+ */
+@RestController
+@RequestMapping("/admin/disGroup")
+public class ADisGroupController {
+
+    @Resource
+    private MkDistributionGroupService mkDistributionGroupService;
+
+    /**
+     * 全民股东群聊
+     */
+    @GetMapping
+    @SaAdminCheckPermission(parentName = "全民股东群聊", value = "share:config", name = "全民股东群聊-配置")
+    public CzgResult<MkDistributionGroup> getShareBase() {
+        return CzgResult.success(mkDistributionGroupService.getById(StpKit.USER.getShopId()));
+    }
+
+    /**
+     * 全民股东群聊:新增/修改
+     */
+    @PostMapping
+    @SaAdminCheckPermission(parentName = "全民股东群聊", value = "share:up", name = "全民股东群聊-新增/修改")
+    public CzgResult<Boolean> editShareBase(@RequestBody MkDistributionGroup group) {
+        group.setShopId(StpKit.USER.getShopId());
+        MkDistributionGroup share = mkDistributionGroupService.getById(group.getShopId());
+        if (share == null) {
+            return CzgResult.success(mkDistributionGroupService.save(group));
+        } else {
+            return CzgResult.success(mkDistributionGroupService.updateById(group, false));
+        }
+    }
+}

cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java

@@ -3,6 +3,7 @@ package com.czg.controller.user;
 import com.czg.account.entity.UserInfo;
 import com.czg.market.dto.MkDistributionUserDTO;
 import com.czg.market.dto.MkDistributionWithdrawFlowDTO;
+import com.czg.market.entity.MkDistributionUser;
 import com.czg.market.entity.MkDistributionWithdrawFlow;
 import com.czg.market.service.MkDistributionConfigService;
 import com.czg.market.service.MkDistributionFlowService;
@@ -16,7 +17,7 @@ import com.czg.sa.StpKit;
 import com.czg.task.DistributionTask;
 import com.czg.utils.AssertUtil;
 import com.mybatisflex.core.paginate.Page;
-import io.seata.core.exception.TransactionException;
+import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
@@ -25,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Map;
 
 /**
- * 分销相关
+ * 全民股东相关
  *
  * @author Administrator
  */
@@ -59,7 +60,7 @@ public class UDistributionController {
 
 
     /**
-     * 分销员中心-获取配置
+     * 全民股东=-获取配置
      */
     @GetMapping("/getConfig")
     public CzgResult<MkDistributionConfigVO> getConfig(@RequestParam Long shopId) {
@@ -67,7 +68,7 @@ public class UDistributionController {
     }
 
     /**
-     * 分销员中心-首页
+     * 全民股东-首页
      */
     @PostMapping("/centerUser")
     public CzgResult<Map<String, Object>> centerUser() {
@@ -75,7 +76,7 @@ public class UDistributionController {
     }
 
     /**
-     * 分销员中心-已开通的店铺
+     * 全民股东界-已开通的店铺
      */
     @GetMapping("/centerUser/activates")
     public CzgResult<Page<DistributionCenterShopVO>> activates(@RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "10") Integer size) {
@@ -83,7 +84,7 @@ public class UDistributionController {
     }
 
     /**
-     * 分销员中心-未开通的店铺
+     * 全民股东-未开通的店铺
      */
     @GetMapping("/centerUser/unActivates")
     public CzgResult<Page<DistributionCenterShopVO>> unActivates(@RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "10") Integer size) {
@@ -91,7 +92,7 @@ public class UDistributionController {
     }
 
     /**
-     * 分销员中心-配置信息
+     * 全民股东-配置信息
      */
     @GetMapping("/centerConfig")
     public CzgResult<Map<String, Object>> centerConfig(@RequestParam Long shopId) {
@@ -99,7 +100,18 @@ public class UDistributionController {
     }
 
     /**
-     * 分销员中心-获取邀请码
+     * 全民股东界面-进入过标识
+     */
+    @GetMapping("/editIn")
+    public CzgResult<Boolean> editIn(@RequestParam Long shopUserId) {
+        MkDistributionUser distributionUser = new MkDistributionUser();
+        distributionUser.setFirstIn(1);
+        distributionUserService.update(distributionUser, QueryWrapper.create().eq(MkDistributionUser::getId, shopUserId));
+        return CzgResult.success();
+    }
+
+    /**
+     * 全民股东-获取邀请码
      */
     @GetMapping("/getInviteCode")
     public CzgResult<String> getInviteCode(@RequestParam Long shopId, @RequestParam Long shopUserId) {
@@ -108,7 +120,7 @@ public class UDistributionController {
 
 
     /**
-     * 分销员中心-实名认证
+     * 全民股东-实名认证
      */
     @PostMapping("/realNameAuth")
     public CzgResult<Map<String, Object>> realNameAuth(@RequestBody UserInfo userInfo) {
@@ -120,7 +132,7 @@ public class UDistributionController {
     }
 
     /**
-     * 分销员中心-绑定邀请人
+     * 全民股东-绑定邀请人
      */
     @PostMapping("/bindInviteUser")
     public CzgResult<Map<String, Object>> bindInviteUser(@RequestBody MkDistributionUserDTO param) {
@@ -132,7 +144,7 @@ public class UDistributionController {
     }
 
     /**
-     * 分销员:获取邀请人分页列表
+     * 全民股东:获取邀请人分页列表
      */
     @GetMapping("/inviteUser")
     public CzgResult<Page<InviteUserVO>> getInviteUser(