Merge remote-tracking branch 'origin/prd-new' into prd-new

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/ShopUserTypeComponent.java

@@ -8,19 +8,16 @@ import com.dgtly.common.utils.StringUtils;
 import com.dgtly.common.utils.http.HttpUtils;
 import com.dgtly.common.utils.security.EncryptPassWordClass;
 import com.dgtly.sync.domain.SyncFailDetail;
-import com.dgtly.sync.mapper.SyncFailDetailMapper;
 import com.dgtly.system.domain.SysUser;
 import com.dgtly.system.domain.SysUserExt;
 import com.dgtly.system.domain.SysUserShopExt;
 import com.dgtly.system.mapper.*;
-import com.dgtly.system.service.ISysConfigService;
 import com.dgtly.system.service.impl.SysUserServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -118,7 +115,7 @@ public class ShopUserTypeComponent {
                 calendar.set(Calendar.MILLISECOND, 0);
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
                 String runTime = sdf.format(calendar.getTime());
-                if (runTime.contains("2025-11-24")){
+                if (runTime.contains("2025-11-29")){
                     runTime = "2025-08-28T00:00";
                 }
                 stoneParams.put("datetime_start", runTime);
@@ -207,7 +204,7 @@ public class ShopUserTypeComponent {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
                 Date date = sdf.parse(truncatedDate);
                 String runTime = sdf.format(date);
-                if (runTime.contains("2025-11-24")){
+                if (runTime.contains("2025-11-29")){
                     runTime = "2025-08-28T00:00";
                 }
                 //获取上次同步时间进行增量同步

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/impl/AnalysisSysUserService.java

@@ -15,10 +15,8 @@ import com.dgtly.sync.mapper.MetaEmployeeMapper;
 import com.dgtly.sync.mapper.SyncFailDetailMapper;
 import com.dgtly.sync.service.IAnalysisSysUserService;
 import com.dgtly.sync.service.ISyncLogService;
-import com.dgtly.system.domain.SysDictData;
-import com.dgtly.system.domain.SysUser;
-import com.dgtly.system.domain.SysUserExt;
-import com.dgtly.system.domain.SysUserRole;
+import com.dgtly.system.domain.*;
+import com.dgtly.system.mapper.SysRoleMapper;
 import com.dgtly.system.mapper.SysUserExtMapper;
 import com.dgtly.system.mapper.SysUserRoleMapper;
 import com.dgtly.system.service.ISysConfigService;
@@ -57,8 +55,15 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
     @Autowired
     private SysUserRoleMapper userRoleMapper;
     @Autowired
+    @SuppressWarnings("all")
+    private SysRoleMapper roleMapper;
+    @Autowired
     private SysUserExtMapper sysUserExtMapper;
 
+    private  String [] paintRoleKeys = {"shopStoneLikePaint"};
+
+    private  String [] goldPoleKeys = {"goldShopUser"};;
+
     /**
      * 解析DIY用户数据  异步执行（new）
      * @param packageId
@@ -1791,6 +1796,15 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(user.getUserId());
                 ur.setRoleId(roleId);
+                SysRole sysRole =  roleMapper.selectRoleById(ur.getRoleId());
+                if (sysRole != null){
+                    if (Arrays.asList(paintRoleKeys).contains(sysRole.getRoleKey())){
+                        ur.setShopType("0");
+                    }
+                    if (Arrays.asList(goldPoleKeys).contains(sysRole.getRoleKey())){
+                        ur.setShopType("1");
+                    }
+                }
                 list.add(ur);
             }
             if (list.size() > 0)

suishenbang-system/src/main/java/com/dgtly/system/domain/SysUser.java

@@ -159,9 +159,6 @@ public class SysUser extends BaseEntity
     private String companyName;
 
 
-    /** 所属组织名称 */
-    private String orgName;
-
     /** 雇员id */
     private String sapEmployeeId;
 
@@ -171,14 +168,6 @@ public class SysUser extends BaseEntity
    //门店对应关系
     private List<Map<String,Object> >loginTypeInfo;
 
-    public String getOrgName() {
-        return orgName;
-    }
-
-    public void setOrgName(String orgName) {
-        this.orgName = orgName;
-    }
-
     public String getSapEmployeeId() {
         return sapEmployeeId;
     }

suishenbang-system/src/main/java/com/dgtly/system/mapper/SysUserMapper.java

@@ -59,21 +59,6 @@ public interface SysUserMapper
      */
     public SysUser selectUserByLoginName(String userName);
 
-    /**
-     * 通过用户名与用户类型查询用户-立邦员工
-     *
-     * @param userName 用户名
-     * @return 用户对象信息
-     */
-    public SysUser selectUserByTypeOne(String userName);
-
-    /**
-     * 通过用户名与用户类型查询用户-经销商
-     *
-     * @param userName 用户名
-     * @return 用户对象信息
-     */
-    public SysUser selectUserByTypeTwo(String userName);
 
     public List<String> selectUserByIsManager(@Param("isCustomerManager") Integer isCustomerManager);
 
@@ -240,7 +225,7 @@ public interface SysUserMapper
      */
     List<SysUser> selectUserByOrgCode(String orgCode);
 
-    Map<String,Object> selectLoginNamesByCostumerCode1(String[] customerCodes);
+//    Map<String,Object> selectLoginNamesByCostumerCode1(String[] customerCodes);
 
     String getCustomNameByCode(String code);
 

suishenbang-system/src/main/java/com/dgtly/system/service/ISysUserService.java

@@ -65,14 +65,6 @@ public interface ISysUserService
     public SysUser selectUserByLoginName(String userName);
 
 
-    /**
-     * 通过用户名与用户类型查询用户
-     *
-     * @param userName 用户名
-     * @return 用户对象信息
-     */
-    public SysUser selectUserByLoginNameAndType(String userName,String userType);
-
 
     public List<String> selectUserByIsManager(Integer isCustomerManager);
 

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysRoleServiceImpl.java

@@ -49,6 +49,10 @@ public class SysRoleServiceImpl implements ISysRoleService
     @SuppressWarnings("all")
     private SysRoleDeptMapper roleDeptMapper;
 
+    private  String [] paintRoleKeys = {"shopStoneLikePaint"};
+
+    private  String [] goldPoleKeys = {"goldShopUser"};;
+
     /**
      * 根据条件分页查询角色数据
      * 
@@ -377,6 +381,15 @@ public class SysRoleServiceImpl implements ISysRoleService
             SysUserRole ur = new SysUserRole();
             ur.setUserId(userId);
             ur.setRoleId(roleId);
+            SysRole sysRole =  roleMapper.selectRoleById(ur.getRoleId());
+            if (sysRole != null){
+                if (Arrays.asList(paintRoleKeys).contains(sysRole.getRoleKey())){
+                    ur.setShopType("0");
+                }
+                if (Arrays.asList(goldPoleKeys).contains(sysRole.getRoleKey())){
+                    ur.setShopType("1");
+                }
+            }
             list.add(ur);
         }
         return userRoleMapper.batchUserRole(list);

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserServiceImpl.java

@@ -72,6 +72,10 @@ public class SysUserServiceImpl implements ISysUserService
     @Value(value = "${spring.esb.esbShopStoneLikePaintUser}")
     private String esbShopStoneLikePaintUserUrl;
 
+    private  String [] paintRoleKeys = {"shopStoneLikePaint"};
+
+    private  String [] goldPoleKeys = {"goldShopUser"};;
+
 
 
     /**
@@ -123,16 +127,6 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserByLoginName(userName);
     }
 
-    @Override
-    public SysUser selectUserByLoginNameAndType(String userName, String userType) {
-        if ("0".equals(userType)){
-            return userMapper.selectUserByTypeOne(userName);
-        }else if ("1".equals(userType)){
-            return userMapper.selectUserByTypeTwo(userName);
-        }else {
-           return userMapper.selectUserByLoginName(userName);
-        }
-    }
 
     @Override
     public List<String> selectUserByIsManager(Integer isCustomerManager) {
@@ -378,6 +372,15 @@ public class SysUserServiceImpl implements ISysUserService
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(user.getUserId());
                 ur.setRoleId(roleId);
+                SysRole sysRole =  roleMapper.selectRoleById(ur.getRoleId());
+                if (sysRole != null){
+                    if (Arrays.asList(paintRoleKeys).contains(sysRole.getRoleKey())){
+                        ur.setShopType("0");
+                    }
+                    if (Arrays.asList(goldPoleKeys).contains(sysRole.getRoleKey())){
+                        ur.setShopType("1");
+                    }
+                }
                 list.add(ur);
             }
             if (list.size() > 0)

suishenbang-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -35,7 +35,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="subOfficeName"       column="subOffice_name"       />
 		<result property="subOfficeCode"       column="subOffice_code"       />
 		<result property="companyName"       column="sales_company_name"       />
-		<result property="orgName"    column="org_name"    />
 		<result property="sapEmployeeId"    column="sap_employee_id"    />
 		<result property="isConsignee"       column="is_consignee"       />
 		<result property="isIndependently"  column="is_independently" />
@@ -96,21 +95,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 	<sql id="selectUserVo">
-        select  u.user_id,u.company_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt,u.id_type,u.id_number,u.account_id,u.is_authentication,u.receive_url_mobile_no, u.status,
-        		u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark,u.is_consignee,u.person_attestation_time,u.is_independently,u.is_self_delivery,is_sync,
-        		c.company_name,u.quit,u.is_shop_account,
-       		    d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-       		    r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
-       		    suse.sales_level,suse.org_name,suse.org_code,suse.sap_employee_id,suse.boss_employee_id,suse.boss_name,suse.customer_code,suse.is_customer_manager,
-       		    suse.post_name,suse.post_code,suse.identity,shop.subOffice_code,shop.subOffice_name,org.sales_company_name,org.sales_office_name
+		select  u.user_id,u.company_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt,u.id_type,u.id_number,u.account_id,u.is_authentication,u.receive_url_mobile_no, u.status,
+				u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark,u.is_consignee,u.person_attestation_time,u.is_independently,u.is_self_delivery,is_sync,
+				c.company_name,u.quit,u.is_shop_account,
+				d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+				r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
+				suse.sales_level,suse.org_name,suse.org_code,suse.boss_employee_id,suse.boss_name,suse.customer_code,suse.is_customer_manager,
+				suse.post_name,suse.post_code,suse.identity,sub.subOffice_code,sub.subOffice_name,sub.sales_company_name,sub.sales_office_name,sub.sap_employee_id
 		from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_company c on u.company_id = c.id
 			 left join sys_user_role ur on u.user_id = ur.user_id
 			 left join sys_role r on r.role_id = ur.role_id
 			 left join sys_user_ext suse on suse.user_id = u.user_id  and suse.del_flag = '0'
-			 LEFT JOIN sys_user_shop_ext shop  on u.user_id = shop.user_id
-			 LEFT JOIN data_master_org org on org.sales_group = shop.subOffice_code
+			 LEFT JOIN v_ssb_subcode sub on sub.login_name = u.login_name
     </sql>
 
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
@@ -230,41 +228,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where u.login_name = #{userName} and u.quit is null and u.del_flag ='0' GROUP BY login_name
 	</select>
 
-	<select id="selectUserByTypeOne" parameterType="String" resultMap="SysUserResult">
-		select  u.user_id,u.company_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt,u.id_type,u.id_number,u.account_id,u.is_authentication,u.receive_url_mobile_no, u.status,
-				u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark,u.is_consignee,u.person_attestation_time,u.is_independently,u.is_self_delivery,is_sync,
-				c.company_name,u.quit,u.is_shop_account,
-				d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-				r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
-				suse.sales_level,suse.org_name,suse.org_code,suse.sap_employee_id,suse.boss_employee_id,suse.boss_name,suse.customer_code,suse.is_customer_manager,
-				suse.post_name,suse.post_code,suse.identity
-		from sys_user u
-				 left join sys_dept d on u.dept_id = d.dept_id
-				 left join sys_company c on u.company_id = c.id
-				 left join sys_user_role ur on u.user_id = ur.user_id
-				 left join sys_role r on r.role_id = ur.role_id
-				 left join sys_user_ext suse on suse.user_id = u.user_id  and suse.del_flag = '0'
-				 LEFT JOIN sys_user_shop_ext shop  on u.user_id = shop.user_id
-		where u.login_name = #{userName} and u.quit is null and u.del_flag ='0' GROUP BY login_name
-	</select>
 
-	<select id="selectUserByTypeTwo" parameterType="String" resultMap="SysUserResult">
-		select  u.user_id,u.company_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt,u.id_type,u.id_number,u.account_id,u.is_authentication,u.receive_url_mobile_no, u.status,
-				u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark,u.is_consignee,u.person_attestation_time,u.is_independently,u.is_self_delivery,is_sync,
-				c.company_name,u.quit,u.is_shop_account,
-				d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-				r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
-				suse.sales_level,suse.org_name,suse.org_code,suse.sap_employee_id,suse.boss_employee_id,suse.boss_name,suse.customer_code,suse.is_customer_manager,
-				suse.post_name,suse.post_code,suse.identity,org.sales_group_name as subOffice_name,org.sales_company_name,org.sales_office_name
-		from sys_user u
-				 left join sys_dept d on u.dept_id = d.dept_id
-				 left join sys_company c on u.company_id = c.id
-				 left join sys_user_role ur on u.user_id = ur.user_id
-				 left join sys_role r on r.role_id = ur.role_id
-				 left join sys_user_ext suse on suse.user_id = u.user_id  and suse.del_flag = '0'
-				 LEFT JOIN data_master_customer org on org.CustomerCode = suse.customer_code
-		where u.login_name = #{userName} and u.quit is null and u.del_flag ='0' GROUP BY login_name
-	</select>
 
 	<select id="selectUserByIsManager"  resultType="java.lang.String">
 		select  u.login_name
@@ -590,15 +554,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		GROUP BY sue.org_code
 	</select>
 
-	<select id="selectLoginNamesByCostumerCode1" resultType="java.util.Map" parameterType="String">
-		select DISTINCT sue.org_code customer_code,GROUP_CONCAT(su.login_name SEPARATOR '|') touser from sys_user  su
-		left join sys_user_ext sue on sue.user_id = su.user_id and sue.del_flag = '0'
-		where su.quit is null and su.del_flag = '0' and sue.org_code in
-		<foreach collection="array" item="customerCode" open="(" separator="," close=")">
-			#{customerCode}
-		</foreach>
-		GROUP BY sue.org_code
-	</select>
+<!--	<select id="selectLoginNamesByCostumerCode1" resultType="java.util.Map" parameterType="String">-->
+<!--		select DISTINCT sue.org_code customer_code,GROUP_CONCAT(su.login_name SEPARATOR '|') touser from sys_user  su-->
+<!--		left join sys_user_ext sue on sue.user_id = su.user_id and sue.del_flag = '0'-->
+<!--		where su.quit is null and su.del_flag = '0' and sue.org_code in-->
+<!--		<foreach collection="array" item="customerCode" open="(" separator="," close=")">-->
+<!--			#{customerCode}-->
+<!--		</foreach>-->
+<!--		GROUP BY sue.org_code-->
+<!--	</select>-->
 
 	<select id="selectLoginNamesByEmployeeCode" resultType="Map" parameterType="String">
 		select DISTINCT sue.sap_employee_id employee_code,GROUP_CONCAT(su.login_name SEPARATOR '|') touser ,sue.org_code from sys_user  su

suishenbang-system/src/main/resources/mapper/system/SysUserShopExtMapper.xml

@@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectLoginNameByUserId" resultType="java.lang.String">
         select login_name from sys_user_shop_ext
-          where constraint_user_id = #{dataUserId} and shop_code = #{shopCode} and  is_shop_type = #{isShopType} limit 1
+          where constraint_user_id = #{dataUserId} and shop_code = #{shopCode} and  is_shop_type = #{shopType} limit 1
     </select>
 
 </mapper>

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxController.java

@@ -86,6 +86,7 @@ public class WxController extends ApiBaseController {
         return AjaxResult.success().putKV("oauth2Url",oauth2Url);
     }
 
+
     @ApiOperation(value = "根据微信coed获取用户信息",
             notes = "参数：{code:123} code微信跳转回来的携带的用户code" +
                     "错误：301 当前用户不是当前企业用户成员" +
@@ -111,12 +112,7 @@ public class WxController extends ApiBaseController {
         }
         userId = json.getString("UserId");
         log.info("当前企业用户登录名称："+userId);
-        SysUser user = new SysUser();
-        if (obj.contaonsKey("userType")){
-            user = sysUserService.selectUserByLoginNameAndType(userId,obj.getString("userType"));
-        }else {
-            user = sysUserService.selectUserByLoginName(userId);
-        }
+        SysUser user = sysUserService.selectUserByLoginName(userId);
         List<Map<String, Object>> result = new ArrayList<>();
         List<Map<String, Object>> loginTypeList = jdbcTemplate.queryForList("select dict_label shopType,dict_value shopTypeValue  from sys_dict_data where  dict_type='system_login_type'  ");
         if(user==null){
@@ -524,12 +520,7 @@ public class WxController extends ApiBaseController {
         obj.checkParameterNotNull("username,password");
         String username = obj.getString("username");
         String password = obj.getString("password");
-        SysUser user = new SysUser();
-        if (obj.contaonsKey("userType")){
-            user = sysUserService.selectUserByLoginNameAndType(username,obj.getString("userType"));
-        }else {
-            user = sysUserService.selectUserByLoginName(username);
-        }
+        SysUser user = sysUserService.selectUserByLoginName(username);
         if (user == null) {
             return AjaxResult.error(302, "查无此人");
         }