Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-web/pom.xml

@@ -143,6 +143,11 @@
             <artifactId>gic-wechat-business-api</artifactId>
             <version>${gic-wechat-business-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-member-api</artifactId>
+            <version>${gic-member-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -18,6 +18,8 @@ import com.gic.enterprise.service.QrCodeApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.log.api.service.LogApiService;
+import com.gic.member.api.dto.StoreBatchUpdateDTO;
+import com.gic.member.api.service.StoreUpdateApiService;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.store.constant.*;
 import com.gic.store.dto.*;
@@ -47,6 +49,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -82,6 +85,8 @@ public class StoreController extends DownloadUtils {
     private StoreTagApiService storeTagApiService;
     @Autowired
     private StoreWidgetApiService storeWidgetApiService;
+    @Autowired
+    private StoreUpdateApiService storeUpdateApiService;
 
     private Map<Integer, SimpleDateFormat> map = new ConcurrentHashMap<>();
     private Map<Integer, SimpleDateFormat> map1 = new ConcurrentHashMap<>();
@@ -412,6 +417,16 @@ public class StoreController extends DownloadUtils {
         return RestResponse.success();
     }
 
+    @RequestMapping("transfer-store-member")
+    public RestResponse transferStoreMember(Integer storeId, Integer toStoreId){
+        StoreBatchUpdateDTO storeBatchUpdateDTO = new StoreBatchUpdateDTO();
+        storeBatchUpdateDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        storeBatchUpdateDTO.setSourceStoreIdList(Arrays.asList(storeId+""));
+        storeBatchUpdateDTO.setTargetStoreId(toStoreId+"");
+        this.storeUpdateApiService.storeBatchUpdate(storeBatchUpdateDTO);
+        return RestResponse.success();
+    }
+
     private List<StoreListSourceVO> getStoreAllListSource(Integer enterpriseId) {
         List<StoreListSourceVO> list = new ArrayList<>();
         ServiceResponse<List<StoreDictDTO>> serviceResponse = this.storeDictApiService.listStoreField(enterpriseId);

gic-store-web/src/main/resources/dubbo-gic-store-web.xml

@@ -56,4 +56,6 @@
     <dubbo:reference interface="com.gic.enterprise.service.QrCodeApiService" id="qrCodeApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.wechat.business.api.service.fwh.WeixinBaseFunService" id="weixinBaseFunService" timeout="6000"/>
     <dubbo:reference interface="com.gic.wechat.business.api.service.wxa.WeixinWxaFunService" id="weixinWxaFunService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.member.api.service.StoreUpdateApiService" id="storeUpdateApiService" timeout="6000"/>
+
 </beans>
\ No newline at end of file