AgentService/doc/deleteAgentAttr.json
File was deleted AgentService/doc/deleteAgentCerdentials.json
File was deleted AgentService/doc/deleteAgentPhoto.json
File was deleted AgentService/doc/deleteAgentUser.json
File was deleted AgentService/doc/saveAgentCerdentials.json
File was deleted AgentService/doc/saveAgentInfo.json
File was deleted AgentService/doc/saveAgentPhoto.json
File was deleted AgentService/doc/saveAgentUser.json
File was deleted AgentService/doc/updateAgentCerdentials.json
File was deleted AgentService/doc/updateAgentInfo.json
File was deleted AgentService/doc/updateAgentPhoto.json
File was deleted AgentService/docker/Dockerfile
File was deleted AgentService/docker/bin/start_agent.sh
File was deleted AgentService/docker/docker-compose.yml
File was deleted AgentService/docker/onStart.sh
File was deleted AgentService/pom.xml
File was deleted AgentService/src/main/java/com/java110/agent/AgentServiceApplicationStart.java
File was deleted AgentService/src/main/java/com/java110/agent/api/AgentApi.java
File was deleted AgentService/src/main/java/com/java110/agent/dao/IAgentServiceDao.java
File was deleted AgentService/src/main/java/com/java110/agent/dao/impl/AgentServiceDaoImpl.java
File was deleted AgentService/src/main/java/com/java110/agent/kafka/AgentServiceBean.java
File was deleted AgentService/src/main/java/com/java110/agent/kafka/AgentServiceKafka.java
File was deleted AgentService/src/main/java/com/java110/agent/listener/AbstractAgentBusinessServiceDataFlowListener.java
File was deleted AgentService/src/main/java/com/java110/agent/listener/DeleteAgentAttrListener.java
File was deleted AgentService/src/main/java/com/java110/agent/listener/DeleteAgentCerdentialsListener.java
File was deleted AgentService/src/main/java/com/java110/agent/listener/DeleteAgentPhotoListener.java
File was deleted AgentService/src/main/java/com/java110/agent/listener/DeleteAgentUserListener.java
File was deleted AgentService/src/main/java/com/java110/agent/listener/SaveAgentCerdentialsListener.java
File was deleted AgentService/src/main/java/com/java110/agent/listener/SaveAgentInfoListener.java
File was deleted AgentService/src/main/java/com/java110/agent/listener/SaveAgentPhotoListener.java
File was deleted AgentService/src/main/java/com/java110/agent/listener/SaveAgentUserListener.java
File was deleted AgentService/src/main/java/com/java110/agent/listener/UpdateAgentCerdentialsListener.java
File was deleted AgentService/src/main/java/com/java110/agent/listener/UpdateAgentInfoListener.java
File was deleted AgentService/src/main/java/com/java110/agent/listener/UpdateAgentPhotoListener.java
File was deleted AgentService/src/main/java/com/java110/agent/smo/IAgentServiceSMO.java
File was deleted AgentService/src/main/java/com/java110/agent/smo/impl/AgentServiceSMOImpl.java
File was deleted AgentService/src/main/resources/application-dev.yml
File was deleted AgentService/src/main/resources/application-prod.yml
File was deleted AgentService/src/main/resources/application-test.yml
File was deleted AgentService/src/main/resources/application.yml
File was deleted AgentService/src/main/resources/banner.txt
File was deleted FeeService/README.md
FeeService/pom.xml
File was renamed from PayService/pom.xml @@ -7,7 +7,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>PayService</artifactId> <artifactId>FeeService</artifactId> <packaging>jar</packaging> <name>PayService</name> FeeService/src/test/java/com/java110/pay/AppTest.java
PropertyService/Readme.md
File was deleted PropertyService/doc/deletePropertyAttr.json
File was deleted PropertyService/doc/deletePropertyCerdentials.json
File was deleted PropertyService/doc/deletePropertyHouse.json
File was deleted PropertyService/doc/deletePropertyPhoto.json
File was deleted PropertyService/doc/deletePropertyUser.json
File was deleted PropertyService/doc/savePropertyCerdentials.json
File was deleted PropertyService/doc/savePropertyFee.json
File was deleted PropertyService/doc/savePropertyHouse.json
File was deleted PropertyService/doc/savePropertyInfo.json
File was deleted PropertyService/doc/savePropertyPhoto.json
File was deleted PropertyService/doc/savePropertyUser.json
File was deleted PropertyService/doc/updatePropertyCerdentials.json
File was deleted PropertyService/doc/updatePropertyFee.json
File was deleted PropertyService/doc/updatePropertyHouse.json
File was deleted PropertyService/doc/updatePropertyInfo.json
File was deleted PropertyService/doc/updatePropertyPhoto.json
File was deleted PropertyService/docker/Dockerfile
File was deleted PropertyService/docker/bin/start_property.sh
File was deleted PropertyService/docker/docker-compose.yml
File was deleted PropertyService/docker/onStart.sh
File was deleted PropertyService/pom.xml
File was deleted PropertyService/src/main/java/com/java110/property/PropertyServiceApplicationStart.java
File was deleted PropertyService/src/main/java/com/java110/property/api/PropertyApi.java
File was deleted PropertyService/src/main/java/com/java110/property/dao/IPropertyServiceDao.java
File was deleted PropertyService/src/main/java/com/java110/property/dao/impl/PropertyServiceDaoImpl.java
File was deleted PropertyService/src/main/java/com/java110/property/kafka/PropertyServiceBean.java
File was deleted PropertyService/src/main/java/com/java110/property/kafka/PropertyServiceKafka.java
File was deleted PropertyService/src/main/java/com/java110/property/listener/AbstractPropertyBusinessServiceDataFlowListener.java
File was deleted PropertyService/src/main/java/com/java110/property/listener/DeletePropertyAttrListener.java
File was deleted PropertyService/src/main/java/com/java110/property/listener/DeletePropertyCerdentialsListener.java
File was deleted PropertyService/src/main/java/com/java110/property/listener/DeletePropertyHouseListener.java
File was deleted PropertyService/src/main/java/com/java110/property/listener/DeletePropertyPhotoListener.java
File was deleted PropertyService/src/main/java/com/java110/property/listener/DeletePropertyUserListener.java
File was deleted PropertyService/src/main/java/com/java110/property/listener/SavePropertyCerdentialsListener.java
File was deleted PropertyService/src/main/java/com/java110/property/listener/SavePropertyFeeListener.java
File was deleted PropertyService/src/main/java/com/java110/property/listener/SavePropertyHouseListener.java
File was deleted PropertyService/src/main/java/com/java110/property/listener/SavePropertyInfoListener.java
File was deleted PropertyService/src/main/java/com/java110/property/listener/SavePropertyPhotoListener.java
File was deleted PropertyService/src/main/java/com/java110/property/listener/SavePropertyUserListener.java
File was deleted PropertyService/src/main/java/com/java110/property/listener/UpdatePropertyCerdentialsListener.java
File was deleted PropertyService/src/main/java/com/java110/property/listener/UpdatePropertyFeeListener.java
File was deleted PropertyService/src/main/java/com/java110/property/listener/UpdatePropertyHouseListener.java
File was deleted PropertyService/src/main/java/com/java110/property/listener/UpdatePropertyInfoListener.java
File was deleted PropertyService/src/main/java/com/java110/property/listener/UpdatePropertyPhotoListener.java
File was deleted PropertyService/src/main/java/com/java110/property/smo/IPropertyServiceSMO.java
File was deleted PropertyService/src/main/java/com/java110/property/smo/impl/PropertyServiceSMOImpl.java
File was deleted PropertyService/src/main/resources/application-dev.yml
File was deleted PropertyService/src/main/resources/application-prod.yml
File was deleted PropertyService/src/main/resources/application-test.yml
File was deleted PropertyService/src/main/resources/application.yml
File was deleted PropertyService/src/main/resources/banner.txt
File was deleted PropertyService/src/test/java/com/java110/AppTest.java
File was deleted SimpleListenerService/pom.xml
File was deleted SimpleListenerService/src/main/java/com/java110/App.java
File was deleted SimpleListenerService/src/test/java/com/java110/AppTest.java
File was deleted WebService/src/main/java/com/java110/web/controller/HomeController.java
@@ -1,5 +1,7 @@ package com.java110.web.controller; import com.java110.common.constant.CommonConstant; import com.java110.core.context.IPageData; import com.java110.web.smo.IFlowServiceSMO; import com.java110.core.base.controller.BaseController; import org.slf4j.Logger; @@ -22,22 +24,28 @@ @Autowired private IFlowServiceSMO consoleServiceSMOImpl; private IFlowServiceSMO flowServiceSMOImpl; @RequestMapping(path = "/") public String index(Model model, HttpServletRequest request) { String template = "index"; IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA); if(!flowServiceSMOImpl.hasStoreInfos(pd)){ //初始化 商户信息 template = "init_company"; } return template; } public IFlowServiceSMO getConsoleServiceSMOImpl() { return consoleServiceSMOImpl; public IFlowServiceSMO getFlowServiceSMOImpl() { return flowServiceSMOImpl; } public void setConsoleServiceSMOImpl(IFlowServiceSMO consoleServiceSMOImpl) { this.consoleServiceSMOImpl = consoleServiceSMOImpl; public void setFlowServiceSMOImpl(IFlowServiceSMO flowServiceSMOImpl) { this.flowServiceSMOImpl = flowServiceSMOImpl; } } WebService/src/main/java/com/java110/web/smo/IFlowServiceSMO.java
@@ -23,4 +23,12 @@ */ public void login(IPageData pd) throws SMOException; /** * 是否有商户信息 * @param pd 前台页面封装对象 * @return * @throws SMOException */ public boolean hasStoreInfos(IPageData pd) throws SMOException; } WebService/src/main/java/com/java110/web/smo/impl/FlowServiceSMOImpl.java
@@ -3,23 +3,18 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.java110.common.cache.MappingCache; import com.java110.common.constant.CommonConstant; import com.java110.common.constant.MappingConstant; import com.java110.common.constant.ResponseConstant; import com.java110.common.constant.ServiceCodeConstant; import com.java110.common.constant.*; import com.java110.common.exception.SMOException; import com.java110.common.util.DateUtil; import com.java110.core.context.IPageData; import com.java110.common.util.Assert; import com.java110.web.core.BaseComponentSMO; import com.java110.web.smo.IFlowServiceSMO; import com.java110.core.factory.GenerateCodeFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.http.*; import org.springframework.stereotype.Service; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; @@ -31,7 +26,7 @@ * Created by wuxw on 2018/4/28. */ @Service("flowServiceSMOImpl") public class FlowServiceSMOImpl implements IFlowServiceSMO { public class FlowServiceSMOImpl extends BaseComponentSMO implements IFlowServiceSMO { private final static Logger logger = LoggerFactory.getLogger(FlowServiceSMOImpl.class); @@ -153,4 +148,31 @@ public void login(IPageData pd) throws SMOException { } /** * 是否有商户信息 * @param pd 前台页面封装对象 * @return * @throws SMOException */ @Override public boolean hasStoreInfos(IPageData pd) throws SMOException { ResponseEntity<String> responseEntity = null; Assert.hasLength(pd.getUserId(),"用户还未登录请先登录"); responseEntity = this.callCenterService(restTemplate,pd,"", ServiceConstant.SERVICE_API_URL+"/api/query.store.byuser?userId="+pd.getUserId(), HttpMethod.GET); if(responseEntity.getStatusCode() != HttpStatus.OK){ return false; } String storeInfo = responseEntity.getBody(); if(Assert.isJsonObject(storeInfo) && JSONObject.parseObject(storeInfo).containsKey("storeId")){ return true; } return false; } } pom.xml
@@ -14,7 +14,7 @@ <module>java110-common</module> <module>UserService</module> <module>LogService</module> <module>PayService</module> <module>FeeService</module> <module>eureka</module> <module>java110-feign</module> <module>java110-core</module> @@ -22,7 +22,6 @@ <module>CodeService</module> <module>StoreService</module> <module>RuleService</module> <module>SimpleListenerService</module> <module>java110-event</module> <module>OrderService</module> <module>java110-cacheAgent</module> @@ -33,8 +32,6 @@ <module>CommentService</module> <module>Api</module> <module>CommunityService</module> <module>AgentService</module> <module>PropertyService</module> </modules> <parent>
