Merge branch 'developer' into 'master'

Developer

See merge request !4

src/main/java/com/gic/message/service/TestService.java

+package com.gic.message.service;
+
+/**
+ * test 
+ * @Title: test
+ * @Description: 
+ * @author taogs 
+ * @param null
+ * @return 
+ * @throws 
+ */
+public interface TestService {
+    /**
+     * test 
+     * @Title: test
+     * @Description: 
+     * @author taogs 
+     * @return void
+     * @throws 
+     */
+    void test();
+}

src/main/java/com/gic/message/service/impl/StoreCustomMessageHandler.java

@@ -83,9 +83,9 @@ public class StoreCustomMessageHandler implements MessageHandler {
                 }
             }
             this.dealStoreInfoChange(enterpriseId, storeInfoId, fieldMap);
-            ServiceResponse<List<StoreDTO>> listStoreResponse1 = this.storeApiService.listStoreByStoreInfoId(storeInfoId);
-            List<StoreDTO> listStore1 = listStoreResponse1.getResult();
-            for(StoreDTO storeDTO : listStore1){
+            ServiceResponse<List<StoreDTO>> listStoreResponseOne = this.storeApiService.listStoreByStoreInfoId(storeInfoId);
+            List<StoreDTO> listStoreOne = listStoreResponseOne.getResult();
+            for(StoreDTO storeDTO : listStoreOne){
                 this.storeIndexRefreshHandler.refreshStoreIndex(storeDTO.getEnterpriseId(), storeDTO.getStoreId());
             }
         }

src/main/java/com/gic/message/service/impl/StoreInfoMessageHandler.java

@@ -70,9 +70,9 @@ public class StoreInfoMessageHandler implements MessageHandler {
                 }
             }
             this.dealStoreInfoChange(enterpriseId, storeInfoId, fieldMap);
-            ServiceResponse<List<StoreDTO>> listStoreResponse1 = this.storeApiService.listStoreByStoreInfoId(storeInfoId);
-            List<StoreDTO> listStore1 = listStoreResponse1.getResult();
-            for(StoreDTO storeDTO : listStore1){
+            ServiceResponse<List<StoreDTO>> listStoreResponseOne = this.storeApiService.listStoreByStoreInfoId(storeInfoId);
+            List<StoreDTO> listStoreOne = listStoreResponseOne.getResult();
+            for(StoreDTO storeDTO : listStoreOne){
                 this.storeIndexRefreshHandler.refreshStoreIndex(storeDTO.getEnterpriseId(), storeDTO.getStoreId());
             }
         }
@@ -116,12 +116,12 @@ public class StoreInfoMessageHandler implements MessageHandler {
                             this.storeAuthorizationApiService.cancelStore(storeInfoId, dto.getUnionEnterpriseId());
                         }
                         if(!Integer.valueOf(fieldMap.get("old_region_id").getValue()).equals(Integer.valueOf(fieldMap.get("new_region_id").getValue()))){
-                            StoreSearchDTO storeSearchDto1 = new StoreSearchDTO();
-                            storeSearchDto1.setRegionId(Integer.valueOf(fieldMap.get("old_region_id").getValue()));
-                            storeSearchDto1.setSearchJson(storeWidgetDTO.getSearchParam());
-                            storeSearchDto1.setEnterpriseId(enterpriseId);
-                            ServiceResponse<Page<StoreDTO>> response1 = this.storeApiService.listStore(storeSearchDTO, 1, 1);
-                            if(CollectionUtils.isEmpty(response1.getResult().getResult())){
+                            StoreSearchDTO storeSearchDtoOne = new StoreSearchDTO();
+                            storeSearchDtoOne.setRegionId(Integer.valueOf(fieldMap.get("old_region_id").getValue()));
+                            storeSearchDtoOne.setSearchJson(storeWidgetDTO.getSearchParam());
+                            storeSearchDtoOne.setEnterpriseId(enterpriseId);
+                            ServiceResponse<Page<StoreDTO>> responseOne = this.storeApiService.listStore(storeSearchDTO, 1, 1);
+                            if(CollectionUtils.isEmpty(responseOne.getResult().getResult())){
                                 this.storeRegionApiService.unAuthorizeRegion(dto.getUnionEnterpriseId(), Integer.valueOf(fieldMap.get("old_region_id").getValue()));
                             }
                         }

src/main/java/com/gic/message/service/impl/TestServiceImpl.java

+package com.gic.message.service.impl;
+
+import com.gic.message.service.TestService;
+import org.springframework.stereotype.Service;
+
+/**
+ * test 
+ * @Title: test
+ * @Description: 
+ * @author taogs 
+ * @param null
+ * @return 
+ * @throws 
+ */
+@Service("testService")
+public class TestServiceImpl implements TestService {
+    /**
+     * test
+     * @Title: test
+     * @Description: 
+     * @author taogs 
+     * @return void
+     * @throws 
+     */
+    @Override
+    public void test() {
+
+    }
+}

src/main/resources/dubbo-gic-platform-message.xml

@@ -14,7 +14,7 @@
     <dubbo:application name="gic-platform-message"/>
 
     <dubbo:protocol name="dubbo" port="20340"/>
-
+    <dubbo:service interface="com.gic.message.service.TestService" ref="testService" timeout="6000" />
     <dubbo:reference interface="com.gic.bizdict.api.service.BizdictService" id="bizdictService " timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.search.business.api.service.EsBusinessOperaApiService" id="esBusinessOperaApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.enterprise.service.PlatformBrandApiService" id="platformBrandApiService" timeout="6000" />