整合同步按钮调整

src/main/java/com/qs/serve/modules/sys/entity/dto/SyUser.java

@@ -0,0 +1,15 @@
+package com.qs.serve.modules.sys.entity.dto;
+
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2023/6/20
+ */
+@Data
+public class SyUser {
+    String id;
+    String name;
+    String code;
+    String mobile;
+}

src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java

@@ -47,6 +47,7 @@ public interface TbsSeeYonConst {
     String API_COUNT_NOT_OK = "/process/countUnfinished";
 
     String OA_USER_LIST = "/process/getUsersByCode";
+    String OA_USER_LIST_1 = "/process/getUsersList";
 
     String XLT_SAVE_CHECK = "/xlt/saveCheck";
     String XLT_SAVE_PAYMENT = "/xlt/savePayment";

src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java

@@ -404,7 +404,6 @@ public class TbsActivityController {
         if(CollectionUtil.isNotEmpty(goodsIds)&&subjectId!=null){
             LambdaQueryWrapper<TbsBudget> lqw = new LambdaQueryWrapper<>();
             lqw.eq(TbsBudget::getBudgetState,1);
-            lqw.eq(TbsBudget::getSubjectId,subjectId);
             //排除随货编码
             lqw.ne(TbsBudget::getSubjectCode,"FYMC05");
             List<TbsBudget> budgetList = tbsBudgetService.list(lqw);

src/main/java/com/qs/serve/task/SysTask.java

@@ -0,0 +1,37 @@
+package com.qs.serve.task;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.util.AuthContextUtils;
+import com.qs.serve.modules.tbs.common.TbsActivityState;
+import com.qs.serve.modules.tbs.entity.TbsActivity;
+import com.qs.serve.task.controller.TaskUserController;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDate;
+
+/**
+ * @author YenHex
+ * @since 2023/6/27
+ */
+@Slf4j
+@Component
+@AllArgsConstructor
+@ConditionalOnProperty(value = "project.task", havingValue = "true")
+public class SysTask {
+
+    TaskUserController taskUserController;
+
+    /**
+     * 同步用户
+     */
+    @Scheduled(cron="0 0 1 * * ?")
+    public void task1(){
+        AuthContextUtils.setTenant("001");
+        taskUserController.test();
+    }
+
+}

src/main/java/com/qs/serve/task/TaskActivityController.java → src/main/java/com/qs/serve/task/controller/TaskActivityController.java

@@ -1,4 +1,4 @@
-package com.qs.serve.task;
+package com.qs.serve.task.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.model.dto.R;
@@ -39,6 +39,15 @@ public class TaskActivityController {
     private final BirBaseActivityService birBaseActivityService;
 
 
+    /**
+     * 同步ERP的发货单，用于计算活动费率
+     * @return
+     */
+    @GetMapping("syncDispatch")
+    public R task0(){
+        //todo
+        return R.ok();
+    }
 
     /**
      * 同步费率底表记录

src/main/java/com/qs/serve/task/TaskPolicyController.java → src/main/java/com/qs/serve/task/controller/TaskPolicyController.java

@@ -1,4 +1,4 @@
-package com.qs.serve.task;
+package com.qs.serve.task.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.model.dto.R;

src/main/java/com/qs/serve/task/TaskSupplierController.java → src/main/java/com/qs/serve/task/controller/TaskSupplierController.java

@@ -1,4 +1,4 @@
-package com.qs.serve.task;
+package com.qs.serve.task.controller;
 
 import com.qs.serve.common.framework.redis.RedisService;
 import com.qs.serve.common.model.consts.RedisCacheKeys;

src/main/java/com/qs/serve/task/controller/TaskUserController.java

@@ -0,0 +1,77 @@
+package com.qs.serve.task.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.model.dto.R;
+import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService;
+import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.modules.sys.entity.dto.SyUser;
+import com.qs.serve.modules.sys.service.SysUserService;
+import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
+import com.qs.serve.modules.wx.service.WxUserService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 【同步】 用户相关
+ * @author YenHex
+ * @since 2023/6/27
+ */
+@Slf4j
+@AllArgsConstructor
+@RestController
+@RequestMapping("/task/user")
+@ConditionalOnProperty(value = "project.task", havingValue = "true")
+public class TaskUserController {
+
+    SeeYonRequestBaseService seeYonRequestBaseService;
+    SysUserService sysUserService;
+
+    /**
+     * 同步致远的用户到CRM
+     * @return
+     */
+    @GetMapping("syncFromSeeYon")
+    public R test(){
+        R<String> rs = seeYonRequestBaseService.getBase(TbsSeeYonConst.OA_USER_LIST_1,null);
+        String listJson = rs.getData();
+        List<SyUser> userList = JsonUtil.jsonToList(listJson, SyUser.class);
+        assert userList != null;
+        if(userList.size()<1){
+            return R.ok();
+        }
+        List<String> codes = userList.stream().map(SyUser::getCode).collect(Collectors.toList());
+        LambdaQueryWrapper<SysUser> userLqw = new LambdaQueryWrapper<>();
+        userLqw.in(SysUser::getCode,codes);
+        List<SysUser> existUserList = sysUserService.list(userLqw);
+        for (SyUser oaUser : userList) {
+            boolean exist = existUserList.stream().anyMatch(a->a.getCode().equals(oaUser.getCode()));
+            if(!exist){
+                SysUser sysUser = new SysUser();
+                sysUser.setCode(oaUser.getCode());
+                sysUser.setMobile(oaUser.getMobile());
+                sysUser.setAccount(oaUser.getCode());
+                sysUser.setId(oaUser.getName());
+                sysUser.setSyUserId(oaUser.getId());
+                sysUser.setSyAccount(oaUser.getCode());
+                sysUser.setServingState(1);
+                sysUser.setServingDate(LocalDate.now());
+                sysUser.setSuperFlag(1);
+                sysUserService.save(sysUser);
+            }
+        }
+        return R.ok();
+    }
+
+
+
+}

src/main/java/com/qs/serve/task/TaskWechatController.java → src/main/java/com/qs/serve/task/controller/TaskWechatController.java

@@ -1,4 +1,4 @@
-package com.qs.serve.task;
+package com.qs.serve.task.controller;
 
 import com.qs.serve.common.framework.redis.RedisService;
 import com.qs.serve.common.model.consts.RedisCacheKeys;