Merge branch 'master' into developer

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

@@ -341,14 +341,13 @@ public class AuditApiServiceImpl implements AuditApiService {
             detailDTO = EntityUtil.changeEntityByJSON(StoreDetailDTO.class, store);
             detailDTO.setStoreId(storeId);
             detailDTO.setEnterpriseId(store.getEnterpriseId());
-            detailDTO.setStatus(2);
+            //detailDTO.setStatus(2);
             detailDTO.setOpenTime(null);
             detailDTO.setCloseTime(null);
             getStoreDTO(detailDTO, changeField, oldValue, newValue);
 
             logger.info("detailDTO====================>为{}", JSONObject.toJSONString(detailDTO));
             storeService.saveStore(detailDTO);
-//			storeService.saveOrUpdateStore(store);
         } else {
             //门店图片修改
             logger.info("===================进333");
@@ -356,7 +355,7 @@ public class AuditApiServiceImpl implements AuditApiService {
         }
     }
 
-    void getStoreDTO(StoreDetailDTO store, String changeField, String oldValue, String newValue) {
+    private void getStoreDTO(StoreDetailDTO store, String changeField, String oldValue, String newValue) {
         logger.info("==========================>changeField={}", changeField);
         if (StoreFieldEnum.BUSINESS_TIME_STRING.getValue().equals(changeField)) {
             SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
@@ -411,48 +410,6 @@ public class AuditApiServiceImpl implements AuditApiService {
 
 
     private void sendMessageByStaffId(String staffId, String storeId, boolean isRefuse, String content, String reason) {
-
-//
-//		TabHaobanStaff staff = staffMapper.selectByPrimaryKey(staffId);
-//		if(staff == null){
-//			logger.info("staff不存在");
-//			return;
-//		}
-//		if(content.length()>30){
-//			content.substring(0, 26);
-//			content = content+"...";
-//		}
-//		String wxUserId = staff.getWxUserId();
-//		String staffName = staff.getStaffName();
-//		String wxEnterpriseId = staff.getWxEnterpriseId();
-//		TabHaobanWxEnterprise tabHaobanWxEnterprise = wxEnterpriseMapper.selectByPrimaryKey(wxEnterpriseId);
-//		String corpId = tabHaobanWxEnterprise.getCorpid();
-//
-//		JSONObject jsonObject = new JSONObject();
-//		jsonObject.put("storeId", storeId);
-//		String data = jsonObject.toJSONString();
-//		String pageUrl = staffDepartmentRelatedApiService.getPageUrl(AppPageType.STORE_DETAIL.getCode(), data);
-//
-//		QywxXcxSendMessageDTO messageDTO = new QywxXcxSendMessageDTO();
-//		List<ItemDTO> items = new ArrayList();;
-//		ItemDTO dto1 = new ItemDTO();
-//		ItemDTO dto2 = new ItemDTO();
-//		dto1.setKey("接收人");
-//		dto1.setValue(staffName);
-//		dto2.setKey("接收事件");
-//		dto2.setValue(content);
-//		items.add(dto1);
-//		items.add(dto2);
-//        ArrayList<String> list = new ArrayList<>();
-//        list.add(wxUserId);
-//		messageDTO.setAppid(config.getAppid());
-//        messageDTO.setUserIds(list);
-//        messageDTO.setPage(pageUrl);
-//        messageDTO.setTitle(title);
-//        messageDTO.setItems(items);
-//		boolean b = qywxSuiteApiService.sendMessage(corpId, config.getWxSuiteid(), messageDTO);
-
-
         StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationApiService.getOneByStoreIdAndStaffId(storeId, staffId);
         if (staffClerkRelationDTO == null) {
             logger.info("staff不存在");