Merge branch 'developer' into 'master'

Developer

See merge request haoban3.0/haoban-manage3.0!22

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java

@@ -91,6 +91,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 				String commitStaffId = tab.getCommitStaffId();
 				map.get(commitStaffId).getStaffName();
 				tab.setCommitStaffName(map.get(commitStaffId)==null?"":map.get(commitStaffId).getStaffName());
+				tab.setCommitStaffImg(map.get(commitStaffId)==null?"":map.get(commitStaffId).getHeadImg());
 			}
 		}
 		return PageUtil.changePageHelperToCurrentPage( page,AuditDTO.class);
@@ -160,9 +161,12 @@ public class AuditApiServiceImpl implements AuditApiService{
 			 //非门店图片修改
 			logger.info("===================进222");
 			StoreDetailDTO detailDTO = new StoreDetailDTO();
+			detailDTO =  EntityUtil.changeEntityByJSON(StoreDetailDTO.class, store);
 			detailDTO.setStoreId(storeId);
 			detailDTO.setEnterpriseId(store.getEnterpriseId());
 			detailDTO.setStatus(2);
+			detailDTO.setOpenTime(null);
+			detailDTO.setCloseTime(null);
 			getStoreDTO( detailDTO, changeField, oldValue, newValue);
 			
 			logger.info("detailDTO====================>为{}",JSONObject.toJSONString(detailDTO));

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

@@ -230,7 +230,7 @@ public class MessageApiServiceImpl implements MessageApiService {
         TabHaobanWxEnterprise enterprise = this.enterpriseService.getEnterpriseBycorpId(qywxCallBackDTO.getAuthCorpId());
         if(enterprise != null){
             staff.setWxEnterpriseId(enterprise.getWxEnterpriseId());
-            staff.setActiveFlag(0);
+            //staff.setActiveFlag(0);
             staff.setPhoneNumber(qywxCallBackDTO.getMobile());
             staff.setNickName(qywxCallBackDTO.getAlias());
             staff.setSex(qywxCallBackDTO.getGender());
@@ -243,16 +243,10 @@ public class MessageApiServiceImpl implements MessageApiService {
             if(qywxCallBackDTO.getStatus() != null && qywxCallBackDTO.getStatus() == 1){
             	staff.setActiveFlag(1);
             }
-            Integer status = qywxCallBackDTO.getStatus();
-            if(status != null && status == 1){
-            	staff.setActiveFlag(1);
-            }
-            if(qywxCallBackDTO.getStatus() != null && qywxCallBackDTO.getStatus() == 1){
-                staff.setActiveFlag(1);
-            } else {
-                staff.setActiveFlag(0);
-            }
             if(qywxCallBackDTO.getChangeType().equals(WxEditType.ADDUSER.getCode())){
+            	if(staff.getActiveFlag() == null){
+            		staff.setActiveFlag(0);
+            	}
                 this.addUser(qywxCallBackDTO, staff);
             } else if(qywxCallBackDTO.getChangeType().equals(WxEditType.UPDATEUSER.getCode())){
                 TabHaobanStaff oldStaff = this.staffService.selectByUserIdAndEnterpriseId(qywxCallBackDTO.getUserid(),enterprise.getWxEnterpriseId());
@@ -275,6 +269,12 @@ public class MessageApiServiceImpl implements MessageApiService {
                     if(staff.getSex() == null){
                     	staff.setSex(oldStaff.getSex());
                     }
+                    if(staff.getActiveFlag() == null){
+                    	staff.setActiveFlag(oldStaff.getActiveFlag());
+                    }
+                    if(StringUtils.isBlank(staff.getHeadImg())){
+                    	staff.setHeadImg(oldStaff.getHeadImg());
+                    }
 //                    this.staffService.updateByPrimaryKey(staff);
 //                    this.staffDepartmentRelatedService.delByUserid(qywxCallBackDTO.getUserid());
 //                    this.addUserDepart(qywxCallBackDTO, oldStaff.getStaffId(), enterprise.getWxEnterpriseId());
@@ -304,6 +304,9 @@ public class MessageApiServiceImpl implements MessageApiService {
                     staffApiService.staffEdit(staffDTO, departmentIds);
                     
                 }else {
+                	if(staff.getActiveFlag() == null){
+                		staff.setActiveFlag(0);
+                	}
                     this.addUser(qywxCallBackDTO, staff);
                 }
             } else {