1111

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

@@ -72,7 +72,7 @@ public class BindApiServiceImpl implements BindApiService {
 			List<ClerkDTO> list = clerkService.listClerk(storeId, clerkCodes, true);
 			for(ClerkDTO clerkDTO :list){
 				clerkDTO.setPhoneNumber("--");
-				clerkDTO.setClerkName("--");
+				clerkDTO.setClerkName(clerkDTO.getClerkName()+"(已解绑)");
 				clerkDTO.setHeadImgUrl("");
 				clerkService.updateClerk(clerkDTO);
 			}
@@ -134,7 +134,7 @@ public class BindApiServiceImpl implements BindApiService {
 			List<ClerkDTO> oldList = clerkService.listClerk(storeId, oldClerkCodes, true);
 			for(ClerkDTO clerkDTO :oldList){
 				clerkDTO.setPhoneNumber("--");
-				clerkDTO.setClerkName("--");
+				clerkDTO.setClerkName(clerkDTO.getClerkName()+"(已解绑)");
 				clerkDTO.setHeadImgUrl("");
 				clerkService.updateClerk(clerkDTO);
 			}
@@ -180,7 +180,7 @@ public class BindApiServiceImpl implements BindApiService {
 			logger.info("oldList====================>{}",JSONObject.toJSONString(oldList));
 			for(ClerkDTO clerkDTO :oldList){
 				clerkDTO.setPhoneNumber("--");
-				clerkDTO.setClerkName("--");
+				clerkDTO.setClerkName(clerkDTO.getClerkName()+"(已解绑)");
 				clerkDTO.setHeadImgUrl("");
 				clerkService.updateClerk(clerkDTO);
 			}
@@ -205,7 +205,7 @@ public class BindApiServiceImpl implements BindApiService {
 		List<ClerkDTO> list = clerkService.listClerk(storeId, clerkCodes, true);
 		for(ClerkDTO clerkDTO :list){
 			clerkDTO.setPhoneNumber("--");
-			clerkDTO.setClerkName("--");
+			clerkDTO.setClerkName(clerkDTO.getClerkName()+"(已解绑)");
 			clerkDTO.setHeadImgUrl("");
 			clerkService.updateClerk(clerkDTO);
 		}		
@@ -226,7 +226,7 @@ public class BindApiServiceImpl implements BindApiService {
 				List<ClerkDTO> list = clerkService.listClerk(storeId, clerkCodes, true);
 				for(ClerkDTO clerkDTO :list){
 					clerkDTO.setPhoneNumber("--");
-					clerkDTO.setClerkName("--");
+					clerkDTO.setClerkName(clerkDTO.getClerkName()+"(已解绑)");
 					clerkDTO.setHeadImgUrl("");
 					clerkService.updateClerk(clerkDTO);
 				}

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

@@ -18,6 +18,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
+import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
@@ -190,8 +191,17 @@ public class StoreController extends WebBaseController{
 			int i = auditApiService.save(1, enterpriseId, staffId, storeId, changeField, oldValue, newValue);
 		}else{
 			//TODO 枚举变量的使用
+		 if(!StoreFieldEnum.STORE_IMAG.getValue().equals(changeField)){
+			 //非门店图片修改
 			getStoreDTO( store, changeField, oldValue, newValue);
 			storeService.saveOrUpdateStore(store);
+		 }else{
+			 //门店图片修改
+			 List<StorePhotoDTO> oldStorePhoto = JSONObject.parseArray(oldValue, StorePhotoDTO.class);
+			 List<StorePhotoDTO> newStorePhoto = JSONObject.parseArray(newValue, StorePhotoDTO.class);
+			 List<String> delPhotos = new ArrayList<>();
+//			 storeService.editStoreImage( storeId, newStorePhoto,  delPhotos);
+		 }
 		}
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
@@ -207,27 +217,29 @@ public class StoreController extends WebBaseController{
 			try {
 				date1 = sdf.parse(openTime);
 			} catch (ParseException e) {
-				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 			try {
 				date2 = sdf.parse(closeTime);
 			} catch (ParseException e) {
-				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 			store.setOpenTime(date1);
 			store.setCloseTime(date2);
 		}else if(StoreFieldEnum.CONACTS_PHONE.getValue().equals(changeField)){
 			//联系电话
+			store.setConactsPhone(newValue);
 		}else if(StoreFieldEnum.STORE_ADDRESS.getValue().equals(changeField)){
 			//门店地址
+			store.setConactsPhone(newValue);
 		}else if(StoreFieldEnum.STORE_AREA.getValue().equals(changeField)){
 			//门店面积
+			store.setConactsPhone(newValue);
 		}else if(StoreFieldEnum.STORE_NAME.getValue().equals(changeField)){
 			//门店名字
+			store.setConactsPhone(newValue);
 		}else if(StoreFieldEnum.STORE_IMAG.getValue().equals(changeField)){
-			//门店名字
+			//门店图片
 		}
 	}