Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -20,6 +20,8 @@ import cn.hutool.core.collection.CollectionUtil;
 
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.GlobalVar;
+import com.gic.commons.util.Md5Util;
+import com.gic.commons.util.RandomUtil;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
@@ -28,6 +30,7 @@ import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.PageResult;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.common.utils.UuidUtil;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
 import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
@@ -37,6 +40,7 @@ import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.EnterpriseDetailVo;
 import com.gic.haoban.operation.api.service.EnterpriseRelationService;
+import com.gic.redis.data.util.RedisUtil;
 
 @RestController
 public class EnterpriseController extends WebBaseController{
@@ -116,7 +120,9 @@ public class EnterpriseController extends WebBaseController{
 	public void ywLogin(String wxEnterpriseId,HttpServletResponse httpServletResponse) throws IOException {
         String host = GlobalVar.ctxPropertiesMap.get("haoban_service_host");
         logger.info("host============================>{}",host);
-        String url=host+LOGIN_URL+"?wxEnterpriseId="+wxEnterpriseId;
+        String random = "ywLogin:"+UuidUtil.randomUUID();
+        RedisUtil.setCache(random, 1,1000L);
+        String url=host+LOGIN_URL+"?wxEnterpriseId="+wxEnterpriseId+"&random="+random;
         httpServletResponse.sendRedirect(url);
 	}
 }

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

@@ -160,9 +160,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/resources/mapper/DictMapper.xml

@@ -120,6 +120,7 @@
     select 
     <include refid="Base_Column_List" />
     from tab_haoban_dict
+    order by update_time desc
   </select>
 
   <select id="queryList" resultMap="BaseResultMap" parameterType="java.lang.String">

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

@@ -22,6 +22,7 @@ import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.config.Config;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.LoginVO;
+import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.dto.qywx.UserDTO;
 import com.gic.wechat.api.service.qywx.QywxCorpApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
@@ -135,7 +136,12 @@ public class LoginController extends WebBaseController{
 	//运维登录
 	@IgnoreLogin
 	@RequestMapping("yw-login")
-	public void ywLogin(String wxEnterpriseId,HttpServletResponse response) {
+	public HaobanResponse ywLogin(String wxEnterpriseId,String random,HttpServletResponse response) {
+		//判断是否存在random
+		Object o = RedisUtil.getCache(random);
+		if(o == null){
+			return resultResponse(HaoBanErrCode.ERR_4);
+		}
 		//TODO 获取超级管理员账号接口
 		StaffDTO staff = staffApiService.selectSuperByWxEnterpriseId(wxEnterpriseId);
 //		StaffDTO staff = staffApiService.selectById("1");
@@ -156,7 +162,10 @@ public class LoginController extends WebBaseController{
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
-		}	}
+		}	
+		return resultResponse(HaoBanErrCode.ERR_1);
+
+	}
 	
 	@RequestMapping("login-out")
 	public HaobanResponse loginOut() {