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/dto/ClerkStoreListDTO.java

@@ -18,6 +18,10 @@ public class ClerkStoreListDTO implements Serializable {
     */
     private static final long serialVersionUID = 747401866482339480L;
 
+    /**
+     * 门店状态
+     */
+    private Integer status;
     private Integer storeId;
     private Integer storeInfoId;
     private String storeName;
@@ -126,6 +130,15 @@ public class ClerkStoreListDTO implements Serializable {
         return this;
     }
 
+    public Integer getStatus() {
+        return status;
+    }
+
+    public ClerkStoreListDTO setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "ClerkStoreListDTO{" +
@@ -139,6 +152,7 @@ public class ClerkStoreListDTO implements Serializable {
                 ", fromEnterpriseName='" + fromEnterpriseName + '\'' +
                 ", ownerFlag=" + ownerFlag +
                 ", ownerEntName='" + ownerEntName + '\'' +
+                ", status='" + status + '\'' +
                 '}';
     }
 }

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

@@ -203,6 +203,16 @@ public interface ClerkApiService {
     ServiceResponse<Void> updateClerkStatus(Integer enterpriseId, String clerkIds, Integer status, Integer userId);
 
     /**
+     * 转移会员
+     * @param enterpriseId
+     * @param oldClerkId
+     * @param newClerkId
+     * @param userId
+     * @return
+     */
+    ServiceResponse<Void> transferMember(Integer enterpriseId, Integer oldClerkId, Integer newClerkId, Integer userId);
+
+    /**
      * 查询list通过id
      * @Title: listClerkByIds
      * @Description:

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

@@ -481,6 +481,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
             clerkStoreListDTO.setOwnType(store.getOwnType());
             clerkStoreListDTO.setFromEnterpriseId(store.getFromEnterpriseId());
             clerkStoreListDTO.setFromEnterpriseName(store.getFromEnterpriseName());
+            clerkStoreListDTO.setStatus(store.getStatus());
             storeClerkDTOList.add(clerkStoreListDTO);
             storeInfoIds.add(store.getStoreInfoId());
         }
@@ -577,7 +578,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
         storeSearchDTO.setStoreResource(clerkSearchDTO.getStoreResource());
 
         return storeApiService.listStore(storeSearchDTO, pageNum, pageSize,
-                "storeId,storeName,storeCode,storeInfoId,ownType,fromEnterpriseId,fromEnterpriseName");
+                "status,storeId,storeName,storeCode,storeInfoId,ownType,fromEnterpriseId,fromEnterpriseName");
     }
 
     @Override
@@ -633,6 +634,10 @@ public class ClerkApiServiceImpl implements ClerkApiService {
                             messageBuiler.append("当前门店下只有 ").append(clerkIdMap.get(clerkId).getClerkName()).append(" 是上线状态；");
                         }
                     }
+                    if (CollectionUtils.isEmpty(needDealClerkIdList)) {
+                        //只能有一个了
+                        needDealClerkIdList.addAll(clerkIdList);
+                    }
                     clerkService.updateClerkStatus(enterpriseId, needDealClerkIdList, status);
                     //导购下线重算导购归属
                     logger.info("导购下线 重算归属:{}", JSON.toJSONString(clerkOfflineDTOList));
@@ -646,6 +651,25 @@ public class ClerkApiServiceImpl implements ClerkApiService {
     }
 
     @Override
+    public ServiceResponse<Void> transferMember(Integer enterpriseId, Integer oldClerkId, Integer newClerkId, Integer userId) {
+        //校验
+        //编辑权限验证
+        TabClerk clerk = this.clerkService.getById(newClerkId);
+        TabClerk oldClerk = this.clerkService.getById(oldClerkId);
+        validStoreIsOther(enterpriseId, clerk.getStoreInfoId());
+        validStoreIsOther(enterpriseId, oldClerk.getStoreInfoId());
+
+        List<ClerkOfflineDTO> clerkOfflineDTOList = new ArrayList<>();
+        ClerkOfflineDTO clerkOfflineDTO = new ClerkOfflineDTO();
+        clerkOfflineDTO.setDelClerkId(oldClerkId);
+        clerkOfflineDTO.setAddClerkId(newClerkId);
+
+        clerkOfflineDTOList.add(clerkOfflineDTO);
+        this.storeUpdateApiService.clerkOffline(enterpriseId, clerkOfflineDTOList, userId);
+        return ServiceResponse.success();
+    }
+
+    @Override
     public ServiceResponse<List<ClerkDTO>> listClerkByIds(Integer enterpriseId, String clerkIds) {
         List<TabClerk> clerkList = clerkService.listClerkByIds(enterpriseId, clerkIds);
         List<ClerkDTO> clerkDTOList = EntityUtil.changeEntityListByJSON(ClerkDTO.class, clerkList);

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

@@ -20,6 +20,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -299,6 +300,7 @@ public class StoreGroupApiServiceImpl implements StoreGroupApiService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ServiceResponse<Integer> insertDefaultStoreGroup(int enterpriseId) {
         StoreGroupDTO noStoreGroup = new StoreGroupDTO();
         noStoreGroup.setEnterpriseId(enterpriseId);

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

@@ -332,6 +332,19 @@ public class ClerkController extends DownloadUtils {
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
+    /**
+     * 转移导购会员
+     * @param oldClerkId
+     * @param newClerkId
+     * @return
+     */
+    @RequestMapping("/transfer-clerk-member")
+    public RestResponse transferClerkMember(Integer oldClerkId, Integer newClerkId) {
+        ServiceResponse serviceResponse = clerkApiService.transferMember(UserDetailUtils.getUserDetail().getEnterpriseId(), oldClerkId,
+                newClerkId, UserDetailUtils.getUserDetail().getUserId());
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
     @RequestMapping("/list-clerk-in-store")
     public RestResponse listClerkInStore(Integer storeInfoId, String search) {
         ServiceResponse<List<ClerkDTO>> serviceResponse = clerkApiService.listClerkByStoreInfoId(UserDetailUtils.getUserDetail().getEnterpriseId(), storeInfoId, search);