|
@@ -1,6 +1,15 @@
|
|
|
package com.sd.cainiao.service.impl;
|
|
|
|
|
|
+import com.ruoyi.common.core.domain.BaseIdPo;
|
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
|
+import com.sd.business.entity.order.po.OrderEncasement;
|
|
|
+import com.sd.business.entity.order.po.OrderEncasementDetail;
|
|
|
+import com.sd.business.entity.order.po.OrderInfo;
|
|
|
+import com.sd.business.entity.order.po.OrderSku;
|
|
|
+import com.sd.business.service.order.OrderEncasementDetailService;
|
|
|
+import com.sd.business.service.order.OrderEncasementService;
|
|
|
+import com.sd.business.service.order.OrderService;
|
|
|
+import com.sd.business.service.order.OrderSkuService;
|
|
|
import com.sd.cainiao.entity.bo.BasicKeyBo;
|
|
|
import com.sd.cainiao.entity.dto.TakeNumParamDto;
|
|
|
import com.sd.cainiao.service.IsticeService;
|
|
@@ -24,8 +33,36 @@ public class IsticeServiceImpl implements IsticeService {
|
|
|
@Autowired
|
|
|
private BasicKeyBo basicKeyBo;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private OrderService orderService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private OrderSkuService orderSkuService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private OrderEncasementService orderEncasementService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private OrderEncasementDetailService orderEncasementDetailService;
|
|
|
+
|
|
|
@Override
|
|
|
- public List<Map<String, Object>> takeNumBatch(List<TakeNumParamDto> dto) {
|
|
|
+ public List<Map<String, Object>> takeNumBatch(List<Long> orderIdList) {
|
|
|
+
|
|
|
+ if (orderIdList.size() == 0) {
|
|
|
+ return Collections.emptyList();
|
|
|
+ }
|
|
|
+
|
|
|
+ List<OrderInfo> orderList = orderService.list(q -> q
|
|
|
+ .and(r -> r.eq(BaseIdPo::getId, orderIdList).isNull(OrderInfo::getMasterOrderId))
|
|
|
+ .or().in(OrderInfo::getMasterOrderId, orderIdList));
|
|
|
+ List<Long> allOrderIdList = orderList.stream().map(BaseIdPo::getId).collect(Collectors.toList());
|
|
|
+
|
|
|
+ List<OrderSku> orderSkuList = orderSkuService.list(q -> q.in(OrderSku::getOrderId, allOrderIdList));
|
|
|
+ List<Long> allOrderSkuIdList = orderSkuList.stream().map(BaseIdPo::getId).collect(Collectors.toList());
|
|
|
+
|
|
|
+ List<OrderEncasement> orderEncasementList = orderEncasementService.list(q -> q.in(OrderEncasement::getOrderId, allOrderIdList));
|
|
|
+ List<OrderEncasementDetail> orderEncasementDetailList = orderEncasementDetailService.list(q -> q.in(OrderEncasementDetail::getOrderSkuId, allOrderSkuIdList));
|
|
|
+
|
|
|
|
|
|
// List<Map<String, Object>> resultList = new ArrayList<>();
|
|
|
//
|