合伙人

authentication/src/main/java/com/jzg/AuthenticationApplication.java

@@ -5,10 +5,12 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 @EnableDiscoveryClient
 @SpringBootApplication
 @EnableFeignClients
+@EnableAsync
 public class AuthenticationApplication {
 
     public static void main(String[] args) {

authentication/src/main/java/com/jzg/client/PartnerDistributionClient.java

@@ -4,13 +4,18 @@ package com.jzg.client;
 import com.jzg.commons.core.page.HttpResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(name = "jzg-partner",url = "http://localhost:8087")
+@FeignClient(name = "jzg-partner",url = "${feign.client.jzg-partner.url}")
 public interface PartnerDistributionClient {
 
 
     @GetMapping("partner/isTherePartner")
     HttpResult<Boolean> isTherePartner(@RequestParam String userId,@RequestParam String systemCode);
 
+
+    @GetMapping("partnerDistribution/initializeCommissionDetails")
+    HttpResult<Boolean> initializeCommissionDetails(@RequestParam String userId,@RequestHeader("Authorization") String token);
+
 }

authentication/src/main/java/com/jzg/config/JzgTokenService.java

@@ -41,6 +41,15 @@ public class JzgTokenService {
         return !Objects.isNull(o) ? o.toString() : null;
     }
 
+    public String getTokenByUsername(String uname) {
+        String pattern = TOKEN_PREFIX + uname + "*";
+        RKeys keys = redissonClient.getKeys();
+        for (String key : keys.getKeysByPattern(pattern)) {
+            return key;
+        }
+        return null;
+    }
+
     //生成token
     public String generateToken(String uname){
         String prefix = TOKEN_PREFIX + uname + ":";

authentication/src/main/java/com/jzg/controller/AppAuthController.java

@@ -3,6 +3,7 @@ package com.jzg.controller;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jzg.client.PartnerDistributionClient;
+import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.po.SysUserJzgInfo;
 import com.jzg.commons.exception.SystemException;
@@ -15,6 +16,7 @@ import com.jzg.entity.vo.AppSmsCodeLogin;
 import com.jzg.entity.vo.ModifyAppLoginVo;
 import com.jzg.handler.JzgAuthenticationSuccessHandler;
 import com.jzg.mapper.SysUserJzgInfoMapper;
+import com.jzg.service.InitializePartnerCommissionService;
 import com.jzg.service.SysUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -44,7 +46,7 @@ import java.util.regex.Pattern;
 @Tag(name="APP授权接口")
 @RestController
 @RequestMapping("appAuth")
-public class AppAuthController {
+public class AppAuthController extends BaseController {
 
     @Autowired
     private JzgTokenService tokenStore;
@@ -64,6 +66,9 @@ public class AppAuthController {
     @Autowired
     private PartnerDistributionClient partnerDistributionClient;
 
+    @Autowired
+    private InitializePartnerCommissionService partnerCommissionService;
+
     @Operation(summary = "登录接口",
             description = "登录接口",
             responses = {
@@ -100,6 +105,7 @@ public class AppAuthController {
                 }
             }
             modifyPass(loginFormVo);
+            partnerCommissionService.initializePartnerCommission(sysUserJzgInfo.getId(),tokenStore.getTokenByUsername(loginFormVo.getMobile()));
         }catch (Exception e){
             throw new ServletException("当前用户不存在或已注销");
         }

gateway/src/main/java/com/jzg/config/CorsConfig.java

@@ -39,6 +39,7 @@ public class CorsConfig {
         corsConfiguration.addAllowedOrigin("http://192.168.0.18:9001");
         corsConfiguration.addAllowedOrigin("http://192.168.0.20:9002");
         corsConfiguration.addAllowedOrigin("http://192.168.0.20:81");
+        corsConfiguration.addAllowedOrigin("http://192.168.0.59:9000");
         // 允许的方法
         corsConfiguration.addAllowedMethod("*");
         // 允许的头信息

partner/src/main/java/com/jzg/controller/DistributionController.java

@@ -1,16 +1,15 @@
 package com.jzg.controller;
 
 
+import cn.hutool.extra.spring.SpringUtil;
 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;
+import com.jzg.utils.UpdateRatioUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @Slf4j
 @RestController
@@ -34,4 +33,11 @@ public class DistributionController extends BaseController {
 
 
 
+    @GetMapping("initializeCommissionDetails")
+    public void initializeCommissionDetails(@RequestParam String userId){
+        SpringUtil.getBean(UpdateRatioUtils.class).loginBefore(userId);
+        SpringUtil.getBean(UpdateRatioUtils.class).loginChange(userId);
+    }
+
+
 }

partner/src/main/java/com/jzg/controller/PartnerUserController.java

@@ -171,7 +171,7 @@ public class PartnerUserController extends BaseController {
      */
     @GetMapping("getUserGradeList")
     public HttpResult getUserGradeList(@RequestParam(value = "userId",required = false) String userId) {
-        return HttpResult.ok(partnerUserService.getUserGradeList(userId));
+        return HttpResult.ok(partnerUserService.getUserGradeList(userId,getToken()));
     }
 
     /**

partner/src/main/java/com/jzg/entity/PartnerKickbackChange.java

@@ -1,6 +1,7 @@
 package com.jzg.entity;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.core.base.PartnerBaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -41,6 +42,7 @@ public class PartnerKickbackChange extends PartnerBaseModel {
     private String changeReason;
 
     @Schema(description = "变更时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date changeTime;
 
 

partner/src/main/java/com/jzg/service/Impl/PartnerUserServiceImpl.java

@@ -361,9 +361,10 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
 
 
     @Override
-    public List<String> getUserGradeList(String userId) {
+    public List<String> getUserGradeList(String userId,String token) {
+        SysUserJzgInfo sysUserJzgInfo = getSysUserJzgInfo(userId, token);
         QueryWrapper<PartnerUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_id", userId);
+        queryWrapper.eq("user_id", sysUserJzgInfo.getId());
         List<PartnerUser> partnerUsers = baseMapper.selectList(queryWrapper);
         return partnerUsers.stream()
                 .map(user -> String.valueOf(user.getGrade()))
@@ -404,6 +405,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
                             partnerUser.setGrade(Integer.valueOf(s));
                             partnerUser.setReferrerId(partnerUsers.getUserId());
                             partnerUser.setCreateTime(LocalDateTime.now());
+                            partnerUser.setStatus(partnerUsers.isStatus());
                             baseMapper.insert(partnerUser);
                         }
                     }
@@ -1632,6 +1634,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
                 partnerUser.setReferrerId(referrerId);
                 partnerUser.setCreateTime(LocalDateTime.now());
                 this.save(partnerUser);
+                SpringUtil.getBean(UpdateRatioUtils.class).before(partnerUser.getUserId(),partnerUser.getGrade());
             }else {
                 if (CollectionUtils.isEmpty(gradeList)) {
                     throw new SystemException("请选择合伙人等级");

partner/src/main/java/com/jzg/service/PartnerUserService.java

@@ -71,7 +71,7 @@ public interface PartnerUserService extends IService<PartnerUser> {
 
     SysPartnerAccount newGetFee(String userId,String token);
 
-    List<String> getUserGradeList(String userId);
+    List<String> getUserGradeList(String userId,String token);
 
     HttpResult addUserIdentity(Map<String, Object> map,String token);
 

partner/src/main/resources/mapper/PartnerUserMapper.xml

@@ -937,7 +937,7 @@ SELECT
 
 
     <select id="queryByUserId" resultType="com.jzg.entity.PartnerUser">
-        SELECT * from  partner_user where user_id = #{referrerId} order by grade desc
+        SELECT * from  partner_user where grade &lt; 5 and user_id = #{referrerId} order by grade desc
     </select>
 
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/client/PartnerDistributionClient.java

@@ -8,7 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = "jzg-partner",url = "http://localhost:8087")
+@FeignClient(name = "jzg-partner",url = "${feign.client.jzg-partner.url}")
 public interface PartnerDistributionClient {
 
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -47,15 +47,12 @@ import com.jzg.quotation.commons.client.PlatformClient;
 import com.jzg.quotation.commons.utils.SnowFlakeUtil;
 import com.jzg.quotation.summary.consumer.template.OrderMessageTemplate;
 import com.jzg.quotation.summary.entity.bo.DataValueBo;
-import com.jzg.quotation.summary.entity.bo.StatDateCountBo;
 import com.jzg.quotation.summary.entity.vo.*;
 import com.jzg.quotation.summary.mapper.*;
 import com.jzg.quotation.summary.service.*;
 import com.jzg.quotation.summary.state.listener.OrderStateListener;
 import com.jzg.quotation.summary.utils.StatisticsUtil;
 import jakarta.servlet.http.HttpServletRequest;
-import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.apache.commons.beanutils.BeanUtils;
@@ -69,7 +66,6 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.net.URL;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -1236,11 +1232,11 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             this.orderStatusMessage(insOrders,
                     insOrdersCarInfo, costs,
                     baseController.getToken(), MessageCodeEnum.TEMPLATE_6);
-//            DistributionVo vo = new DistributionVo();
-//            vo.setInsOrders(insOrders);
-//            vo.setOrdersCosts(costs);
-//            vo.setLicenseNo(insOrdersCarInfo.getLicenseNo());
-//            partnerDistributionClient.distribution(vo);
+            DistributionVo vo = new DistributionVo();
+            vo.setInsOrders(insOrders);
+            vo.setOrdersCosts(costs);
+            vo.setLicenseNo(insOrdersCarInfo.getLicenseNo());
+            partnerDistributionClient.distribution(vo);
         } else {
             insOrders.setErrorMessage(orderStatusResultVo.getErrorMsg());
         }