Merge branch 'test-xq2' into test

# Conflicts:
#	src/main/java/com/ydtech/modules/admin/components/wechat/customer/request/CustomerSendMsgOnEventRequest.java
#	src/main/java/com/ydtech/modules/admin/service/impl/WechatCustomerServiceImpl.java

src/main/java/com/ydtech/modules/admin/components/wechat/customer/request/CustomerSendMsgOnEventRequest.java

@@ -4,6 +4,7 @@ package com.ydtech.modules.admin.components.wechat.customer.request;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.modules.admin.components.wechat.customer.response.CustomerSyncMsgResponse;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -55,8 +56,12 @@ public class CustomerSendMsgOnEventRequest extends CustomerBaseRequest {
     }
 
 
-    public static CustomerSendMsgOnEventRequest sendMsgOnEvent(SysUser sysUser, String code, boolean workingHours) {
+    public static CustomerSendMsgOnEventRequest sendMsgOnEvent(SysUser sysUser, String code, boolean workingHours,String partnerVersion) {
         String messages = "你好！" + sysUser.getName() + "(" + sysUser.getId() + ")" + "很高兴为你服务";
+        if (StringUtils.isNotEmpty(partnerVersion)){
+            messages += "-" + partnerVersion;
+        }
+        messages += ")" + "很高兴为你服务";
         // 发送欢迎信息
         if (!workingHours) {
             messages = "您好" + sysUser.getName() + "(" + sysUser.getId() + ")" + "～当前客服暂时不在服务时间，服务时间为：周一至周五：8:30-12:00，14:00-18:30，周六至周日：9:00-12:00，14:00-18:00，当前未到服务时间，请您在服务时段内咨询~";

src/main/java/com/ydtech/modules/admin/controller/SysLoginController.java

@@ -377,7 +377,7 @@ public class SysLoginController {
         // 用户信息
         String phone = phoneLoginVo.getPhone();
         String phoneMsg = phoneLoginVo.getPhoneMsg();
-        SysUser user = sysUserService.findByPhone(phone);
+        SysUser user = sysUserService.findByPhoneNotPartner(phone);
         if (user == null) {
             //手机号不存在注册用户:上线测试团队
             user = sysUserService.registerAPPUser(phone);

src/main/java/com/ydtech/modules/admin/dao/SysUserMapper.java

@@ -582,6 +582,10 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     @Select("SELECT COUNT(r.role_id) FROM sys_user u LEFT JOIN sys_user_role r ON u.id = r.user_id WHERE u.mobile = #{mobile} AND r.role_id = #{roleId}")
     int countTeamLeader(@Param("mobile")String mobile,@Param("roleId") String roleId);
+
+    SysUser findByPhoneNotPartner(String phone);
+
+    String getPartnerVersion(@Param("userId") String id);
 }
 
 

src/main/java/com/ydtech/modules/admin/service/SysUserService.java

@@ -405,6 +405,10 @@ public interface SysUserService extends BaseIService<SysUser> {
 
 
     SysUser findPartUserByPhone(String phone);
+
+    SysUser findByPhoneNotPartner(String phone);
+
+    String getPartnerVersion(String id);
 }
 
 

src/main/java/com/ydtech/modules/admin/service/impl/SysLoginServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 @Service
 @Slf4j
@@ -115,6 +116,9 @@ public class SysLoginServiceImpl implements SysLoginService {
         }
         //查询用户角色
         SysRole sysRole = sysUserRoleService.gainRoleByUserId(user.getId());
+        if (!Objects.isNull(sysRole) && 108 == sysRole.getId()) {
+            return HttpResult.error("当前工号无权限登录");
+        }
         //设置用户角色
         user.setRoleId(sysRole.getId().toString());
         user.setRoleName(sysRole.getName());

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -1333,6 +1333,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return sysUser;
     }
 
+    @Override
+    public SysUser findByPhoneNotPartner(String phone) {
+        return sysUserMapper.findByPhoneNotPartner(phone);
+    }
+
+    @Override
+    public String getPartnerVersion(String id) {
+        return sysUserMapper.getPartnerVersion(id) ;
+    }
+
 
     //  邀请的是团队长   去创建团队长部门
     public String  addNewTeam(SysUser sysUser) {

src/main/java/com/ydtech/modules/fnc/service/impl/InsFeeAuditServiceImpl.java

@@ -486,6 +486,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 account1.setCashFee(account1.getCashFee().add(detail.getExtractFee()));
                 partnerPartnerAccountMapper.updateById(account1);
             }
+            detail.setStatus(1);
+            partnerPremiumDetailsMapper.updateById(detail);
         }
     }
 

src/main/java/com/ydtech/modules/partner/controller/NewAppPartnerController.java

@@ -181,7 +181,7 @@ public class NewAppPartnerController extends BaseController {
      */
     @GetMapping("/getUserInfo")
     @ApiOperation(value = "APP个人信息")
-    public HttpResult<AppUserInfoVo> getUserInfo(@RequestParam("type") Integer type) {
+    public HttpResult<AppUserInfoVo> getUserInfo(String type) {
 
         return HttpResult.ok("success",partnerUserService.getUserInfo(type));
     }

src/main/java/com/ydtech/modules/partner/dao/PartnerPremiumDetailsMapper.java

@@ -47,13 +47,13 @@ public interface PartnerPremiumDetailsMapper extends BaseMapper<PartnerPremiumDe
     List<Map<String,Object>> selectCombinedStatistics(@Param("ew")QueryWrapper<PartnerPremiumDetails> wrapper);
 
     //
-    @Select("SELECT SUM(extract_fee) AS commission FROM partner_premium_details WHERE app_status = 1 AND user_id = #{userId} AND source = #{grade} AND DATE(create_time) >= DATE(#{createTime}) ")
+    @Select("SELECT SUM(extract_fee) AS commission FROM partner_premium_details WHERE app_status = 1 AND status = 1 AND user_id = #{userId} AND source = #{grade} AND DATE(create_time) >= DATE(#{createTime}) ")
     BigDecimal commissionAfterUserLocking(@Param("userId") String userId,@Param("grade") Integer grade,@Param("createTime") Date createTime);
 
-    @Select("UPDATE partner_premium_details SET app_status = 0 WHERE app_status = 1 AND source = #{originalLevel} AND user_id = #{userId} AND DATE(create_time) >= #{identityTime} ")
+    @Update("UPDATE partner_premium_details SET app_status = 0 WHERE app_status = 1 AND source = #{originalLevel} AND user_id = #{userId} AND DATE(create_time) >= #{identityTime} ")
     void updateAppStatus(@Param("originalLevel") String originalLevel,@Param("userId") String userId, @Param("identityTime")Date identityTime);
 
-    @Select(" SELECT create_time FROM partner_premium_details WHERE app_status = 1 AND user_id = #{userId} AND source = #{grade} ORDER BY create_time  LIMIT 1 ")
+    @Select(" SELECT create_time FROM partner_premium_details WHERE app_status = 1 AND status = 1 AND user_id = #{userId} AND source = #{grade} ORDER BY create_time  LIMIT 1 ")
     Date queryRemainingDaysExpiration(@Param("userId") String userId, @Param("grade") Integer grade);
 
 }

src/main/java/com/ydtech/modules/partner/service/Impl/PartnerPremiumDetailsServiceImpl.java

@@ -73,6 +73,7 @@ public class PartnerPremiumDetailsServiceImpl extends ServiceImpl<PartnerPremium
             }
         }
         queryWrapper.orderByDesc("d.create_time");
+        queryWrapper.eq("d.status", 1);
         return baseMapper.queryPage(detailsParam.getPage(), queryWrapper);
     }
 

src/main/java/com/ydtech/modules/partner/service/Impl/PartnerUserServiceImpl.java

@@ -1124,6 +1124,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
         QueryWrapper<PartnerPremiumDetails> wrapper = new QueryWrapper<>();
         wrapper.in("user_id", userIds);
         wrapper.eq("source", sort);
+        wrapper.eq("status", 1);
         wrapper.groupBy("user_id");
 
         // 合并查询结果处理
@@ -1175,6 +1176,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
         QueryWrapper<PartnerPremiumDetails> wrapper = new QueryWrapper<>();
         wrapper.in("user_id", userIds);
         wrapper.eq("source", sort);
+        wrapper.eq("status", 1);
         wrapper.groupBy("user_id");
 
         // 合并查询结果处理
@@ -1229,6 +1231,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
         QueryWrapper<PartnerPremiumDetails> wrapper = new QueryWrapper<>();
         wrapper.in("user_id", userIds);
         wrapper.eq("source", sort);
+        wrapper.eq("status", 1);
         wrapper.groupBy("user_id");
         
         // 合并查询结果处理
@@ -1279,7 +1282,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
     }
 
     @Override
-    public AppUserInfoVo getUserInfo(Integer type) {
+    public AppUserInfoVo getUserInfo(String type) {
         String userId = BaseController.getUserId();
         AppUserInfoVo appUserInfoVo = sysUserMapper.queryByUserId(userId);
         Integer min = baseMapper.selectGradeIntMin(userId);

src/main/java/com/ydtech/modules/partner/service/PartnerUserService.java

@@ -46,7 +46,7 @@ public interface PartnerUserService extends IService<PartnerUser> {
 
     boolean selectByUserIdList(String id);
 
-    AppUserInfoVo getUserInfo(Integer type);
+    AppUserInfoVo getUserInfo(String type);
 
     HttpResult selectByGradeList(PartnerApp partnerApp);
 

src/main/java/com/ydtech/modules/partner/utils/CalculateCommissionUtils.java

@@ -74,6 +74,7 @@ public class CalculateCommissionUtils {
         if (CollectionUtil.isNotEmpty(userIdList)) {
             QueryWrapper<PartnerPremiumDetails> queryWrapper = new QueryWrapper<>();
             queryWrapper.in("user_id", userIdList);
+            queryWrapper.eq("status", "1");
             if (StringUtils.isNotEmpty(period.getStartDate()) && StringUtils.isNotEmpty(period.getEndDate())) {
                 queryWrapper.between("create_time", period.getStartDate(), period.getEndDate());
             }

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -2176,8 +2176,25 @@
         </if>
     </select>
 
+    <select id="findByPhoneNotPartner" resultType="com.ydtech.modules.admin.model.SysUser">
+        SELECT
+            u.*
+        FROM
+            sys_user u
+                LEFT JOIN sys_user_role r ON r.user_id = u.id
+        WHERE
+            r.role_id != 108 AND u.mobile = #{phone}
+        ORDER BY  u.create_time DESC LIMIT 1
+    </select>
 
-
+    <select id="getPartnerVersion" resultType="java.lang.String">
+        SELECT
+            CASE
+                WHEN EXISTS ( SELECT id FROM partner_user WHERE user_id = #{userId} ) THEN 1
+                WHEN EXISTS ( SELECT id FROM sys_partner WHERE user_id = #{userId} ) THEN 2
+                    ELSE 3
+                END AS result;
+    </select>
 
     <select id="findPartnerUserList" resultType="com.ydtech.modules.admin.model.vo.SysUserBaseVO">
         SELECT

src/main/resources/mapper/modules/partner/PartnerPartnerAccountMapper.xml

@@ -5,25 +5,25 @@
 
     <select id="selectStatisticalData" resultType="com.ydtech.modules.partner.model.PartnerPartnerAccount">
         SELECT ifnull((
-                   SELECT SUM(sumpremium) FROM partner_premium_details WHERE user_id = #{params.userId} AND source = #{params.grade}
+                   SELECT SUM(sumpremium) FROM partner_premium_details WHERE status = 1 and user_id = #{params.userId} AND source = #{params.grade}
                            <if test="params.startTime != null and params.endTime != null">
                                AND DATE(create_time) BETWEEN #{params.startTime} AND #{params.endTime}
                            </if>
                ),0) sumPremium,
                 ifnull((
-                           SELECT SUM(extract_fee) FROM partner_premium_details WHERE user_id = #{params.userId} AND source = #{params.grade}
+                           SELECT SUM(extract_fee) FROM partner_premium_details WHERE status = 1 and user_id = #{params.userId} AND source = #{params.grade}
                                 <if test="params.startTime != null and params.endTime != null">
                                     AND DATE(create_time) BETWEEN #{params.startTime} AND #{params.endTime}
                                 </if>
                        ),0) extractFee,
                 ifnull((
-                           SELECT SUM(extract_fee) FROM partner_premium_details WHERE user_id = #{params.userId} AND source = #{params.grade} AND app_status = 2
+                           SELECT SUM(extract_fee) FROM partner_premium_details WHERE status = 1 and user_id = #{params.userId} AND source = #{params.grade} AND app_status = 2
                                 <if test="params.startTime != null and params.endTime != null">
                                     AND DATE(create_time) BETWEEN #{params.startTime} AND #{params.endTime}
                                 </if>
                        ),0) expired,
                 ifnull((
-                           SELECT SUM(extract_fee) FROM partner_premium_details WHERE user_id = #{params.userId} AND source = #{params.grade} AND app_status = 1
+                           SELECT SUM(extract_fee) FROM partner_premium_details WHERE status = 1 and user_id = #{params.userId} AND source = #{params.grade} AND app_status = 1
                                 <if test="params.startTime != null and params.endTime != null">
                                     AND DATE(create_time) BETWEEN #{params.startTime} AND #{params.endTime}
                                 </if>

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

@@ -93,7 +93,7 @@
     <select id="selectTodayOverview" resultType="com.ydtech.modules.partner.model.vo.TodayOverview">
         SELECT
         ifnull((
-        SELECT COUNT(DISTINCT company_id) FROM partner_premium_details WHERE  user_id IN
+        SELECT COUNT(DISTINCT company_id) FROM partner_premium_details WHERE status = 1  AND  user_id IN
         <foreach collection="params.relatedPerList" item="item" index="index" separator="," open="(" close=")">
             #{item}
         </foreach>
@@ -113,7 +113,7 @@
         ) addPerNumber,
         ifnull((
             SELECT SUM(db.sumpremium) FROM (SELECT DISTINCT company_id,sumpremium  FROM partner_premium_details
-            WHERE user_id IN
+            WHERE status = 1  AND user_id IN
             <foreach collection="params.relatedPerList" item="item" index="index" separator="," open="(" close=")">
                 #{item}
             </foreach>
@@ -124,7 +124,7 @@
             ),0
         ) premium,
         ifnull(
-            (SELECT SUM(extract_fee) FROM partner_premium_details where  user_id = #{params.userId}
+            (SELECT SUM(extract_fee) FROM partner_premium_details where status = 1  AND  user_id = #{params.userId}
         <if test="params.startTime != null and params.endTime != null">
             AND create_time BETWEEN #{params.startTime} AND #{params.endTime}
         </if> ),0
@@ -212,10 +212,10 @@ SELECT
                                AND u.referrer_id = #{params.userId}
                          )),0
             ) v4,
-        ifnull((SELECT sum(sumpremium) FROM partner_premium_details WHERE  to_days(create_time) = to_days(now()) AND user_id = #{params.userId} and source = #{grade}),0
+        ifnull((SELECT sum(sumpremium) FROM partner_premium_details WHERE status = 1  AND to_days(create_time) = to_days(now()) AND user_id = #{params.userId} and source = #{grade}),0
         ) v5,
         ifnull(
-        (SELECT SUM(extract_fee) FROM partner_premium_details WHERE source = #{grade} AND to_days(create_time) = to_days(now()) AND user_id = #{params.userId}),0
+        (SELECT SUM(extract_fee) FROM partner_premium_details WHERE status = 1  AND source = #{grade} AND to_days(create_time) = to_days(now()) AND user_id = #{params.userId}),0
         ) v6
     </select>
 
@@ -341,10 +341,10 @@ SELECT
             p.grade = 3
             AND p.referrer_id = #{params.userId}
             )),0) v4,
-            ifnull((SELECT sum(sumpremium) FROM partner_premium_details WHERE  to_days(create_time) = to_days(now()) AND user_id = #{params.userId} and source = #{grade}),0
+            ifnull((SELECT sum(sumpremium) FROM partner_premium_details WHERE status = 1  AND to_days(create_time) = to_days(now()) AND user_id = #{params.userId} and source = #{grade}),0
             ) v5,
             ifnull(
-                (SELECT SUM(extract_fee) FROM partner_premium_details WHERE source = #{grade} AND to_days(create_time) = to_days(now()) AND user_id = #{params.userId}),0
+                (SELECT SUM(extract_fee) FROM partner_premium_details WHERE status = 1  AND source = #{grade} AND to_days(create_time) = to_days(now()) AND user_id = #{params.userId}),0
             ) v6
         </if>
         <if test="grade == 3">
@@ -395,10 +395,10 @@ SELECT
                 AND p.referrer_id = #{params.userId}
                 )),0
             ) v4,
-            ifnull((SELECT sum(sumpremium) FROM partner_premium_details WHERE  to_days(create_time) = to_days(now()) AND user_id = #{params.userId} and source = #{grade} ),0
+            ifnull((SELECT sum(sumpremium) FROM partner_premium_details WHERE status = 1  AND to_days(create_time) = to_days(now()) AND user_id = #{params.userId} and source = #{grade} ),0
             ) v5,
             ifnull(
-            (SELECT SUM(extract_fee) FROM partner_premium_details WHERE source = #{grade} and to_days(create_time) = to_days(now()) AND user_id = #{params.userId}),0
+            (SELECT SUM(extract_fee) FROM partner_premium_details WHERE status = 1  AND source = #{grade} and to_days(create_time) = to_days(now()) AND user_id = #{params.userId}),0
             ) v6
         </if>
         <if test="grade == 4">
@@ -451,8 +451,8 @@ SELECT
             AND p.referrer_id = #{params.userId}
             )),0
             ) v4,
-            ifnull( (SELECT SUM(sumpremium) FROM partner_premium_details WHERE source = #{grade} and user_id = #{params.userId} AND to_days(create_time) = to_days(now())),0 ) v5,
-            ifnull( (SELECT SUM(extract_fee) FROM partner_premium_details WHERE source = #{grade} and user_id = #{params.userId} AND to_days(create_time) = to_days(now())),0 ) v6
+            ifnull( (SELECT SUM(sumpremium) FROM partner_premium_details WHERE status = 1  AND source = #{grade} and user_id = #{params.userId} AND to_days(create_time) = to_days(now())),0 ) v5,
+            ifnull( (SELECT SUM(extract_fee) FROM partner_premium_details WHERE status = 1  AND source = #{grade} and user_id = #{params.userId} AND to_days(create_time) = to_days(now())),0 ) v6
         </if>
     </select>
 
@@ -830,7 +830,7 @@ SELECT
         FROM
             partner_premium_details
         WHERE
-            user_id = #{map.userId} and source = #{map.grade}
+            status = 1 AND user_id = #{map.userId} and source = #{map.grade}
             <if test="map.startTime != '' and map.startTime != null">
                 and DATE(create_time) BETWEEN #{map.startTime} AND #{map.endTime}
             </if>
@@ -1050,7 +1050,7 @@ SELECT
 
     <select id="selectOwnSumPremium" resultType="java.math.BigDecimal">
         SELECT SUM(db.sumpremium) AS premium FROM (
-                  SELECT DISTINCT orderno,sumpremium FROM partner_premium_details WHERE user_id IN(
+                  SELECT DISTINCT orderno,sumpremium FROM partner_premium_details WHERE status = 1 AND user_id IN(
                       SELECT user_id FROM partner_user WHERE user_id IN(
                           SELECT id FROM sys_user WHERE identity = (SELECT identity FROM sys_user WHERE id = #{userId})
               ) AND grade > 4
@@ -1064,7 +1064,7 @@ SELECT
 
     <select id="subordinateMembersInsurancePremiums" resultType="java.math.BigDecimal">
         SELECT SUM(db.sumpremium) FROM (
-            SELECT DISTINCT orderno,sumpremium FROM partner_premium_details WHERE user_id IN(
+            SELECT DISTINCT orderno,sumpremium FROM partner_premium_details WHERE status = 1 AND user_id IN(
                 WITH RECURSIVE cte_name AS (
                     SELECT user_id,referrer_id, grade FROM partner_user
                     WHERE user_id = #{userId} AND grade = #{grade}