111

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

@@ -154,12 +154,11 @@ public class AuditApiServiceImpl implements AuditApiService{
 		if(!StoreFieldEnum.STORE_IMAG.getValue().equals(changeField)){
 			 //非门店图片修改
 			logger.info("===================进222");
-			StoreDTO newStore = new StoreDTO();
-			newStore.setStoreId(store.getStoreId());
-			getStoreDTO( newStore, changeField, oldValue, newValue);
-			
-			StoreDetailDTO detailDTO = EntityUtil.changeEntityByJSON(StoreDetailDTO.class, newStore);
+			StoreDetailDTO detailDTO = new StoreDetailDTO();
+			detailDTO.setStoreId(storeId);
 			detailDTO.setEnterpriseId(store.getEnterpriseId());
+			getStoreDTO( detailDTO, changeField, oldValue, newValue);
+			
 			logger.info("detailDTO====================>为{}",JSONObject.toJSONString(detailDTO));
 			storeService.saveStore(detailDTO);
 //			storeService.saveOrUpdateStore(store);
@@ -169,7 +168,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 			 storeService.updateStorePhotos(storeId, newValue);
 		 }		
 	}
-	void getStoreDTO(StoreDTO store,String changeField,String oldValue,String newValue){
+	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");
@@ -177,20 +176,20 @@ public class AuditApiServiceImpl implements AuditApiService{
 			String [] newValues = newValue.split("-");
 			String openTime = newValues[0];
 			String closeTime = newValues[1];
-			Date date1 = null;
-			Date date2 = null;
-			try {
-				date1 = sdf.parse(openTime);
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-			try {
-				date2 = sdf.parse(closeTime);
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-			store.setOpenTime(date1);
-			store.setCloseTime(date2);
+//			Date date1 = null;
+//			Date date2 = null;
+//			try {
+//				date1 = sdf.parse(openTime);
+//			} catch (ParseException e) {
+//				e.printStackTrace();
+//			}
+//			try {
+//				date2 = sdf.parse(closeTime);
+//			} catch (ParseException e) {
+//				e.printStackTrace();
+//			}
+			store.setOpenTime(openTime);
+			store.setCloseTime(closeTime);
 		}else if(StoreFieldEnum.CONACTS_PHONE.getValue().equals(changeField)){
 			//联系电话
 			store.setConactsPhone(newValue);