Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/DepartmentContoller.java

@@ -125,7 +125,7 @@ public class DepartmentContoller extends WebBaseController{
 	
 	@RequestMapping("department-list-level")
 	public HaobanResponse departmentLevelList(String parentId) {
-		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		logger.info("【部门层级列表】wxEnterpriseId={}",wxEnterpriseId);
 		List<DepartmentDTO> list = new ArrayList<DepartmentDTO>();

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/SyncDealContoller.java

@@ -39,7 +39,7 @@ public class SyncDealContoller extends WebBaseController {
             task = dealSyncOperationApiService.createTask(wxEid, "门店同步", "11111", "部门同步");
             dealSyncOperationApiService.dealDepartment(task, wxEid, qo.getAddDepartment(), qo.getEditDepartment());
         } else {
-            LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+            LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
             String wxEnterpriseId = login.getWxEnterpriseId();
             String key = "haoban-sync-department-" + wxEnterpriseId;
             if (RedisUtil.getCache(key) != null) {
@@ -58,7 +58,7 @@ public class SyncDealContoller extends WebBaseController {
     public HaobanResponse departmentBatchSync(@RequestBody SyncDealQO qo) {
         String task = null;
 
-        LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+        LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
 
         logger.info("login:{}", JSONObject.toJSONString(login));
@@ -86,7 +86,7 @@ public class SyncDealContoller extends WebBaseController {
     @RequestMapping("department-sync-check")
     public HaobanResponse syncSuccess(String wxEnterpriseId) {
         if (StringUtils.isBlank(wxEnterpriseId)) {
-            LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+            LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
             wxEnterpriseId = login.getWxEnterpriseId();
         }
         SyncCheckDTO taskCheck = dealSyncOperationApiService.getTaskCheck(wxEnterpriseId);
@@ -102,7 +102,7 @@ public class SyncDealContoller extends WebBaseController {
     @RequestMapping("/test/department-sync-check")
     public HaobanResponse testSyncSuccess(String wxEnterpriseId) {
         if (StringUtils.isBlank(wxEnterpriseId)) {
-            LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+            LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
             wxEnterpriseId = login.getWxEnterpriseId();
         }
         SyncCheckDTO taskCheck = dealSyncOperationApiService.getTaskCheck(wxEnterpriseId);
@@ -113,7 +113,7 @@ public class SyncDealContoller extends WebBaseController {
     @ResponseBody
     public HaobanResponse clerkReSync(String taskId) {
         if (StringUtils.isBlank(taskId)) {
-            LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+            LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
             String wxEnterpriseId = login.getWxEnterpriseId();
             taskId = dealSyncOperationApiService.getTaskLock(wxEnterpriseId);
         }
@@ -126,7 +126,7 @@ public class SyncDealContoller extends WebBaseController {
     @ResponseBody
     public HaobanResponse closeReSync(String wxEnterpriseId) {
         if (StringUtils.isBlank(wxEnterpriseId)) {
-            LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+            LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
             wxEnterpriseId = login.getWxEnterpriseId();
         }
         dealSyncOperationApiService.closeTask(wxEnterpriseId);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java

@@ -297,14 +297,14 @@ public class ClerkController extends WebBaseController{
 				return resultResponse(HaoBanErrCode.ERR_10013);
 			}
 		}
-		if(clerk != null && StringUtils.isNotBlank(clerk.getPhoneNumber())){
-			syncHaobanToGicServiceApi.syncHaobanClerkPhoneNumberToGic(clerk.getClerkId(), phoneNumber);
-		}else{
-			boolean flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAdd(storeId, clerkCode, sex, staffName, phoneNumber, nationcode, postion);
-			if(!flag){
-				return resultResponse(HaoBanErrCode.ERR_10010);
-			}
+//		if(clerk != null && StringUtils.isNotBlank(clerk.getPhoneNumber())){
+//			syncHaobanToGicServiceApi.syncHaobanClerkPhoneNumberToGic(clerk.getClerkId(), phoneNumber);
+//		}else{
+		boolean flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAdd(storeId, clerkCode, sex, staffName, phoneNumber, nationcode, postion);
+		if(!flag){
+			return resultResponse(HaoBanErrCode.ERR_10010);
 		}
+//		}
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}