合伙人bug修改

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

@@ -218,7 +218,7 @@ public class PartnerUserController extends BaseController {
      */
     @GetMapping("queryDowngradeTask")
     public HttpResult queryDowngradeTask(@RequestParam(value = "grade") String grade) {
-        return partnerUserService.queryDowngradeTask(grade, getUserId());
+        return partnerUserService.queryDowngradeTaskVo(grade, getUserId());
     }
 
 

partner/src/main/java/com/jzg/mapper/PartnerUserMapper.java

@@ -151,8 +151,7 @@ public interface PartnerUserMapper extends BaseMapper<PartnerUser> {
 
     UserRuleVo queryUserRuleVo(@Param("userId") String userId, @Param("grade")Integer grade,@Param("period") CommissionValidityPeriod period);
 
-    @Select("SELECT upgrade_cycle_start_time as startDate FROM partner_user WHERE user_id = (SELECT info.id FROM sys_user_jzg_info info INNER JOIN sys_user_jzg_info_salesman sa ON sa.sys_user_jzg_info_id = info.id " +
-            " WHERE sa.type_attr = 3 AND sa.partner_status = 3 AND info.id = #{userId}) AND grade = #{grade}")
+    @Select("SELECT upgrade_cycle_start_time as startDate FROM partner_user WHERE user_id = #{userId} AND grade = #{grade}")
     CommissionValidityPeriod selectUpgradeCycleStartTime(@Param("userId") String userId,@Param("grade") Integer grade);
 
     @Update("UPDATE partner_user SET upgrade_cycle_start_time = #{newDate} WHERE  user_id = #{userId} and grade = #{grade} ")

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

@@ -173,7 +173,8 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
 
     @Override
     public HttpResult submitLiftingRecord(UserGradeParam userGradeParam) {
-
+        SysUserJzgInfo sysUserJzgInfo = getSysUserJzgInfo(userGradeParam.getId());
+        userGradeParam.setId(sysUserJzgInfo.getId());
         boolean checked = ruleService.verifyUpgradeConditions(userGradeParam.getId(), String.valueOf(Integer.valueOf(userGradeParam.getGrade()) + 1));
         if (!checked) {
             return HttpResult.error("请先达成升级条件");
@@ -433,17 +434,22 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
 
     @Override
     public HttpResult queryIdentityInformation(String userId, String token) {
-        SysUserJzgInfo sysUserJzgInfo = getSysUserJzgInfo(userId);
-        List<PartnerRule> partnerRules = ruleService.selectAll();
-        List<PartnerUser> partnerUsers = baseMapper.selectList(new LambdaQueryWrapper<>(PartnerUser.class).eq(PartnerUser::getUserId, sysUserJzgInfo.getId()));
-        Map<Integer, PartnerUser> userMap = partnerUsers.stream()
-                .collect(Collectors.toMap(
-                        PartnerUser::getGrade,
-                        user -> user
-                ));
-
-        List<MyUserLevel> list = getUserLevels(sysUserJzgInfo.getId(), partnerRules, userMap);
-        return HttpResult.ok(list);
+        try {
+            SysUserJzgInfo sysUserJzgInfo = getSysUserJzgInfo(userId);
+            List<PartnerRule> partnerRules = ruleService.selectAll();
+            List<PartnerUser> partnerUsers = baseMapper.selectList(new LambdaQueryWrapper<>(PartnerUser.class).eq(PartnerUser::getUserId, sysUserJzgInfo.getId()));
+            Map<Integer, PartnerUser> userMap = partnerUsers.stream()
+                    .collect(Collectors.toMap(
+                            PartnerUser::getGrade,
+                            user -> user
+                    ));
+
+            List<MyUserLevel> list = getUserLevels(sysUserJzgInfo.getId(), partnerRules, userMap);
+            return HttpResult.ok(list);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return HttpResult.error("查询用户信息异常");
     }
 
 
@@ -506,11 +512,13 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
     }
 
     @Override
-    public HttpResult degradedTask(String grade, String userId) {
+    public HttpResult degradedTask(String grade, String sysUserId) {
         PartnerRuleEntity partnerRuleEntity = ruleService.selectByGrade(grade);
         if (partnerRuleEntity == null) {
             return HttpResult.error("等级不存在");
         }
+        SysUserJzgInfo sysUserJzgInfo = getSysUserJzgInfo(sysUserId);
+        String userId = sysUserJzgInfo.getId();
         partnerRuleEntity.setRequirement(null);
         CommissionValidityPeriod period = baseMapper.selectUpgradeCycleStartTime(userId, Integer.valueOf(grade));
         period.setEndDate(SpringUtil.getBean(ExpiredCommissionUtils.class).generateDowngradeTime(grade, period.getStartDate()));
@@ -1739,6 +1747,12 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
 
     }
 
+    @Override
+    public HttpResult queryDowngradeTaskVo(String grade, String userId) {
+        SysUserJzgInfo sysUserJzgInfo = getSysUserJzgInfo(userId);
+        return queryDowngradeTask(grade,sysUserJzgInfo.getId());
+    }
+
     @NotNull
     private static PartnerUser getPartnerUser(SysUserJzgInfo info, PartnerUser partnerUser) {
         PartnerUser user = new PartnerUser();

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

@@ -110,4 +110,6 @@ public interface PartnerUserService extends IService<PartnerUser> {
     boolean teamInvitation(SysUserJzgInfo info);
 
     void commissionInitialization(List<String> infoId);
+
+    HttpResult queryDowngradeTaskVo(String grade, String userId);
 }

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

@@ -965,7 +965,7 @@ SELECT
         WHERE
         sa.type_attr = 3
         AND sa.partner_status = 3
-        AND info.user_id = #{userId}
+        AND info.id = #{userId}
         )
         SELECT
         COUNT(1) AS total_count
@@ -975,7 +975,7 @@ SELECT
         ON u.referrer_id = tu.jzg_info_id
         WHERE
         u.grade = #{grade}
-        AND u.user_id != tu.jzg_info_id
+--         AND u.user_id != tu.jzg_info_id
         <if test="period.startDate != null and period.endDate != null">
             AND tu.partner_review_time BETWEEN #{period.startDate} AND #{period.endDate}
         </if>

platform/src/main/java/com/jzg/PlatFormApplication.java

@@ -4,10 +4,12 @@ package com.jzg;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 
 @SpringBootApplication
 @EnableDiscoveryClient
+@EnableScheduling
 public class PlatFormApplication {
     public static void main(String[] args) {
         SpringApplication.run(PlatFormApplication.class, args);

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -1449,8 +1449,8 @@
 
 
     <select id="selectListOrderQuotationCompany" resultType="com.jzg.quotation.summary.entity.vo.OrderQuotationCompany">
-        SELECT id,parent_id,quote_no,company_id,company_name,order_status
-        FROM ins_orders
+        SELECT id,parent_id,quote_no,company_id,company_name,order_status,fee.total_premium
+        FROM ins_orders LEFT JOIN ins_fee_orders fee ON fee.order_no = ins_orders.id
         WHERE parent_id != 0 AND quote_no IN
         <foreach collection="noIds" item="item" open="(" separator="," close=")">
             #{item}