Преглед изворни кода

修改合伙人登录初始化数据

xuqiang пре 5 месеци
родитељ
комит
b29d63b5bb

+ 2 - 2
authentication/src/main/java/com/jzg/client/PartnerDistributionClient.java

@@ -12,10 +12,10 @@ public interface PartnerDistributionClient {
 
 
     @GetMapping("/partner/isTherePartner")
-    HttpResult<Boolean> isTherePartner(@RequestParam String userId, @RequestParam String systemCode);
+    HttpResult<Boolean> isTherePartner(@RequestParam String userId);
 
 
     @GetMapping("/partnerDistribution/initializeCommissionDetails")
-    HttpResult<Boolean> initializeCommissionDetails(@RequestParam String userId);
+    HttpResult<Boolean> initializeCommissionDetails(@RequestParam String userId,@RequestHeader("Authorization") String token);
 
 }

+ 2 - 2
authentication/src/main/java/com/jzg/controller/AppAuthController.java

@@ -102,14 +102,14 @@ public class AppAuthController extends BaseController {
             if (!isApproved){
                 throw new ServletException("当前用户未审核通过");
             }
-            HttpResult<Boolean> isTherePartner = partnerDistributionClient.isTherePartner(sysUserJzgInfo.getId(), loginFormVo.getSystem());
+            HttpResult<Boolean> isTherePartner = partnerDistributionClient.isTherePartner(sysUserJzgInfo.getId());
             if (200 == isTherePartner.getCode()) {
                 if (!isTherePartner.getData()) {
                     throw new ServletException("当前用户无登录权限");
                 }
             }
             modifyPass(loginFormVo);
-            partnerCommissionService.initializePartnerCommission(sysUserJzgInfo.getId());
+            partnerCommissionService.initializePartnerCommission(sysUserJzgInfo.getId(),loginFormVo.getMobile());
         } catch (Exception e) {
             throw new ServletException("当前用户不存在或已注销");
         }

+ 1 - 1
authentication/src/main/java/com/jzg/service/InitializePartnerCommissionService.java

@@ -5,7 +5,7 @@ public interface InitializePartnerCommissionService {
 
 
 
-    void initializePartnerCommission(String userId);
+    void initializePartnerCommission(String userId,String mobile);
 
 
 }

+ 6 - 2
authentication/src/main/java/com/jzg/service/impl/InitializePartnerCommissionServiceImpl.java

@@ -1,9 +1,11 @@
 package com.jzg.service.impl;
 
 import com.jzg.client.PartnerDistributionClient;
+import com.jzg.config.JzgTokenService;
 import com.jzg.service.InitializePartnerCommissionService;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
@@ -12,15 +14,17 @@ import org.springframework.stereotype.Service;
 @Service
 public class InitializePartnerCommissionServiceImpl implements InitializePartnerCommissionService {
 
+    @Autowired
+    private JzgTokenService tokenStore;
 
     @Resource
     private PartnerDistributionClient distributionClient;
 
     @Async
     @Override
-    public void initializePartnerCommission(String userId) {
+    public void initializePartnerCommission(String userId,String mobile) {
         try {
-            distributionClient.initializeCommissionDetails(userId);
+            distributionClient.initializeCommissionDetails(userId,tokenStore.getTokenByUsername(mobile));
         }catch (Exception e){
             log.error("初始化用户佣金失败:{}", e.getMessage());
             e.printStackTrace();

+ 2 - 1
partner/src/main/java/com/jzg/controller/DistributionController.java

@@ -3,6 +3,7 @@ package com.jzg.controller;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson2.JSONObject;
+import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.vo.DistributionVo;
 import com.jzg.utils.DistributionUtils;
@@ -13,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
 @Slf4j
 @RestController
 @RequestMapping("/partnerDistribution")
-public class DistributionController{
+public class DistributionController extends BaseController {
 
 
     @PostMapping("generateDistributionData")