Commit f6f346d1 by 陶光胜

门店批量导入修改

parent 38ae55ab
......@@ -13,13 +13,12 @@ import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.enterprise.service.EnterpriseApiService;
import com.gic.enterprise.service.WmStoreSyncLogApiService;
import com.gic.member.config.api.dto.UserOwnerDefaultDTO;
import com.gic.member.config.api.service.CardAscriptionConfigService;
import com.gic.mq.sdk.GicMQClient;
import com.gic.redis.data.util.RedisUtil;
import com.gic.spark.api.service.SparkJobApiService;
import com.gic.store.constant.ClerkLogReasonEnum;
import com.gic.store.constant.ImportClerkBatchResultEnum;
import com.gic.store.constant.StoreLogTypeEnum;
import com.gic.store.constant.StoreOwnTypeEnum;
import com.gic.store.constant.*;
import com.gic.store.dto.*;
import com.gic.store.dto.clerk.OrderAddClerkDTO;
import com.gic.store.dto.clerk.PosAddClerkDTO;
......@@ -73,6 +72,8 @@ public class ClerkApiServiceImpl implements ClerkApiService {
private ClerkPositionService clerkPositionService;
@Autowired
private SparkJobApiService sparkJobApiService;
@Autowired
private CardAscriptionConfigService cardAscriptionConfigService;
@Override
public ServiceResponse saveOrUpdate(ClerkDTO clerkDTO) {
......@@ -454,7 +455,21 @@ public class ClerkApiServiceImpl implements ClerkApiService {
String[] split = clerkIds.split(GlobalInfo.FLAG_COMMA);
clerkIdList = Stream.of(split).map(Integer::parseInt).collect(Collectors.toList());
}
Integer i = clerkService.updateClerkStatus(enterpriseId, clerkIdList, status);
List<Integer> clerkIdListNew = new ArrayList<>();
if(StoreStatusEnum.INONLINE.getCode() == status){
List<UserOwnerDefaultDTO> result = this.cardAscriptionConfigService.getDefaultUserOwner(enterpriseId).getResult();
if(CollectionUtils.isNotEmpty(result)){
clerkIdListNew = clerkIdList.stream().filter(clerkId -> {
for(UserOwnerDefaultDTO dto : result){
if(clerkId.intValue() == dto.getClerkId().intValue()){
return false;
}
}
return true;
}).collect(Collectors.toList());
}
}
Integer i = clerkService.updateClerkStatus(enterpriseId, CollectionUtils.isEmpty(clerkIdListNew) ? clerkIdList : clerkIdListNew, status);
for (Integer clerkId : clerkIdList) {
sparkJobApiService.updateClerkStatus(enterpriseId, clerkId.longValue(), 1 == status ? 0 : 1);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment