Commit 2ea20328 by zhiwj

会员处理进度条

parent 6c2e4f9c
......@@ -22,7 +22,9 @@ import com.gic.enterprise.utils.LicenseUtils;
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.BatchTaskOperaInfDTO;
import com.gic.member.api.dto.StoreBatchUpdateDTO;
import com.gic.member.api.service.BatchOperationApiService;
import com.gic.member.api.service.StoreUpdateApiService;
import com.gic.redis.data.util.RedisUtil;
import com.gic.store.constant.*;
......@@ -52,9 +54,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
......@@ -97,6 +97,8 @@ public class StoreController extends DownloadUtils {
private EnterpriseApiService enterpriseApiService;
@Autowired
private StoreTransferApiService storeTransferApiService;
@Autowired
private BatchOperationApiService batchOperationApiService;
private Map<Integer, SimpleDateFormat> map = new ConcurrentHashMap<>();
......@@ -613,6 +615,23 @@ public class StoreController extends DownloadUtils {
return EnterpriseRestResponse.failure(response);
}
@RequestMapping("process-store-member")
public RestResponse transferStoreMember(){
ServiceResponse<List<BatchTaskOperaInfDTO>> resp = batchOperationApiService.queryUnderwayTask(UserDetailUtils.getUserDetail().getEnterpriseId());
if (!resp.isSuccess()) {
return ResultControllerUtils.commonResult(resp);
}
List<BatchTaskOperaInfDTO> list = resp.getResult();
if (CollectionUtils.isNotEmpty(list)) {
List<BatchTaskOperaInfDTO> processList = list.stream().filter(e -> e.getTaskType() == 17).collect(Collectors.toList());
return RestResponse.success(processList);
}
return RestResponse.success(Collections.emptyList());
}
private List<StoreListSourceVO> getStoreAllListSource(Integer enterpriseId) {
List<StoreListSourceVO> list = new ArrayList<>();
ServiceResponse<List<StoreDictDTO>> serviceResponse = this.storeDictApiService.listStoreField(enterpriseId);
......
......@@ -63,5 +63,6 @@
<dubbo:reference interface="com.gic.enterprise.service.AuditLogApiService" id="auditLogApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.enterprise.service.EnterpriseApiService" id="enterpriseApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.store.service.DictApiService" id="dictApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.member.api.service.BatchOperationApiService" id="batchOperationApiService" timeout="6000"/>
</beans>
\ No newline at end of file
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