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

gic-store-api/src/main/java/com/gic/store/service/StoreApiService.java

@@ -32,6 +32,8 @@ public interface StoreApiService {
     */
     ServiceResponse<Integer> saveStoreForOrder(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String orderNum);
 
+    ServiceResponse<Integer> saveStoreForOrder(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String orderNum, Integer storeBrandId);
+
     /**
      * @Title: saveStoreForPosMember
      * @Description: 同步pos会员创建门店
@@ -46,6 +48,8 @@ public interface StoreApiService {
      */
     ServiceResponse<Integer> saveStoreForPosMember(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String cardNO);
 
+    ServiceResponse<Integer> saveStoreForPosMember(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String cardNO, Integer storeBrandId);
+
     /**
      * @Title: countByOverflowStatus
      * @Description:

gic-store-service/src/main/java/com/gic/store/service/impl/StoreServiceImpl.java

@@ -226,13 +226,13 @@ public class StoreServiceImpl implements StoreService {
     }
 
     @Override
-    public int bulkUpdateStoreStatus(String storeIds, Integer enterpriseId, String value) {
-        if ("all".equals(storeIds)) {
+    public int bulkUpdateStoreStatus(String storeInfoIds, Integer enterpriseId, String value) {
+        if ("all".equals(storeInfoIds)) {
             return this.tabStoreInfoMapper.updateAllStoreStatus(enterpriseId, Integer.valueOf(value));
         }
-        String[] storeIdArr = storeIds.split(",");
+        String[] storeInfoIdArr = storeInfoIds.split(",");
         List<Integer> list = new ArrayList<>();
-        for (String s : storeIdArr) {
+        for (String s : storeInfoIdArr) {
             list.add(Integer.valueOf(s));
         }
         return this.tabStoreInfoMapper.updateStoreStatusBystoreInfoIds(Integer.valueOf(value), list);
@@ -553,4 +553,4 @@ public class StoreServiceImpl implements StoreService {
     public int refreshStoreIndex(Integer enterpriseId, Integer storeGroupId) {
         return this.tabStoreMapper.refreshStoreIndexByStoreGroup(enterpriseId, storeGroupId);
     }
-}
+}
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -246,6 +246,11 @@ public class StoreApiServiceImpl implements StoreApiService {
 
     @Override
     public ServiceResponse<Integer> saveStoreForOrder(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String orderNum) {
+        return saveStoreForOrder(enterpriseId, storeCode, storeName, regionId, orderNum, null);
+    }
+
+    @Override
+    public ServiceResponse<Integer> saveStoreForOrder(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String orderNum, Integer storeBrandId) {
         ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense = this.enterpriseApiService.listEnterpriseLicense(enterpriseId);
         Integer storeLicenseNum = 0;
         if(listEnterpriseLicense.isSuccess() && CollectionUtils.isNotEmpty(listEnterpriseLicense.getResult())){
@@ -267,6 +272,7 @@ public class StoreApiServiceImpl implements StoreApiService {
         storeDTO.setStoreCode(storeCode);
         storeDTO.setStoreName(storeName);
         storeDTO.setRegionId(regionId);
+        storeDTO.setStoreBrands(storeBrandId.toString());
         storeDTO.setCreateType(CreateTypeEnum.ORDER.getCode());
         ServiceResponse<StoreDTO> response = this.saveOrUpdate(storeDTO);
         if(response.isSuccess()){
@@ -277,6 +283,11 @@ public class StoreApiServiceImpl implements StoreApiService {
 
     @Override
     public ServiceResponse<Integer> saveStoreForPosMember(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String cardNO) {
+        return saveStoreForPosMember(enterpriseId, storeCode, storeName, regionId, cardNO, null);
+    }
+
+    @Override
+    public ServiceResponse<Integer> saveStoreForPosMember(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String cardNO, Integer storeBrandId) {
         ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense = this.enterpriseApiService.listEnterpriseLicense(enterpriseId);
         Integer storeLicenseNum = 0;
         if(listEnterpriseLicense.isSuccess() && CollectionUtils.isNotEmpty(listEnterpriseLicense.getResult())){
@@ -298,6 +309,7 @@ public class StoreApiServiceImpl implements StoreApiService {
         storeDTO.setStoreCode(storeCode);
         storeDTO.setStoreName(storeName);
         storeDTO.setRegionId(regionId);
+        storeDTO.setBrandIds(storeBrandId.toString());
         storeDTO.setCreateType(CreateTypeEnum.MEMBER.getCode());
         ServiceResponse<StoreDTO> response = this.saveOrUpdate(storeDTO);
         if(response.isSuccess()){