suishenbang-quartz/src/main/java/com/dgtly/quartz/task/RyTask.java

@@ -77,7 +77,7 @@ public class RyTask
      */
     public void shopStoneLikePaint() throws ParseException {
         //获取TUC仿石漆服务商人员
-       // shopUserTypeComponent.shopStoneLikePaint();
+        shopUserTypeComponent.shopStoneLikePaint();
         //获取金牌店用户人员
         shopUserTypeComponent.shopGoldShopUser();
     }

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

@@ -107,16 +107,17 @@ public class ShopUserTypeComponent {
             stoneParams.put("page", 1);
             stoneParams.put("page_size", 100);
             String dateString = userShopExtMapper.searchRunTime("0");
+
             if(dateString !=null){
-                // 截取前3位毫秒数
-                String truncatedDate = dateString.substring(0, dateString.lastIndexOf('.') + 4);
+                Calendar calendar = Calendar.getInstance();
+                calendar.add(Calendar.DAY_OF_MONTH, -3);
+                calendar.set(Calendar.HOUR_OF_DAY, 0);
+                calendar.set(Calendar.MINUTE, 0);
+                calendar.set(Calendar.SECOND, 0);
+                calendar.set(Calendar.MILLISECOND, 0);
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
-                Date date = sdf.parse(truncatedDate);
-                String runTime = sdf.format(date);
-                //获取上次同步时间进行增量同步
-                if(runTime !=null && !runTime.isEmpty()){
-                     stoneParams.put("datetime_start", runTime);
-                }
+                String runTime = sdf.format(calendar.getTime());
+                stoneParams.put("datetime_start", runTime);
             }
             //TUC仿石漆服务商人员-0
             Long roleId = roleMapper.selectRoleIdByRoleKey("shopStoneLikePaint");

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

@@ -439,9 +439,9 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                         insertUserRole(user);
                         //}
 
-                        if(!"division_level".equals(sysUser.getSysUserExt().getSalesLevel())){
-                            user.setSysUserExt(userExt);
-                        }
+
+                        user.setSysUserExt(userExt);
+
                         user.setUpdateTime(new Date());
                         sysUserService.updateUserInfoAndSalesExt(user);
                     } else {
@@ -603,9 +603,9 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                         user.setUserId(sysUser.getUserId());
                         insertUserRole(user);
 
-                        if(!"applicationService_level".equals(sysUser.getSysUserExt().getSalesLevel())){
-                            user.setSysUserExt(userExt);
-                        }
+
+                        user.setSysUserExt(userExt);
+
                         user.setUpdateTime(new Date());
                         sysUserService.updateUserInfoAndSalesExt(user);
                     } else {