提交修改

api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java

@@ -108,7 +108,6 @@ public class VvPackageServiceImpl extends ServiceImpl<VvPackageDao, VvPackageEnt
             vvPackageEntity.setStatus(kuaiDi100DTO.getStatus());
             vvPackageEntity.setState(kuaiDi100DTO.getState());
             vvPackageEntity.setPackageLogisticsInfo(JSON.toJSONString(kuaiDi100DTO));
-
             if (StringUtils.isBlank(vvPackageEntity.getLogisticsCompany())
                     && StringUtils.isNotEmpty(kuaiDi100DTO.getCom())) {
                 vvPackageEntity.setLogisticsCompany(LogisticsMapUtils.getLogisticsCompanyName(kuaiDi100DTO.getCom()));
@@ -118,8 +117,6 @@ public class VvPackageServiceImpl extends ServiceImpl<VvPackageDao, VvPackageEnt
             ) {
                 vvPackageEntity.setShippingFrom(kuaiDi100DTO.getRouteInfo().getFrom().getName());
             }
-
-
             // 如果查询出来包裹状态已经签收
             if (KuaiDi100StateEnums.sign_receipt.getState().equals(kuaiDi100DTO.getState())) {
                 List<KuaiDi100DTO.DataDTO> dataDTOS = kuaiDi100DTO.getData();
@@ -147,7 +144,6 @@ public class VvPackageServiceImpl extends ServiceImpl<VvPackageDao, VvPackageEnt
                                 message.getMessageProperties().setDelay((second) * 1000);   // 毫秒为单位，指定此消息的延时时长 ,+ 1 尽量保证机器人跑完了，再发送消息
                                 return message;
                             });
-
                             // 设置已经发送消息了
                             vvPackageEntity.setIscheck("2");
                             vvPackageEntity.setGmtSendMqDelivered(new Date());

api-third/src/main/java/com/heyu/api/service/impl/VvTradeOrderConvertServiceImpl.java

@@ -6,6 +6,8 @@ import com.heyu.api.data.dao.vv.VvPackageDao;
 import com.heyu.api.data.entity.vv.VvPackageEntity;
 import com.heyu.api.data.entity.vv.VvTradeOrderEntity;
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
+import com.heyu.api.data.enums.RoleEnums;
+import com.heyu.api.data.service.vv.VvPackageService;
 import com.heyu.api.data.utils.SanUtils;
 import com.heyu.api.data.utils.StringUtils;
 import com.heyu.api.service.VvTradeOrderConvertService;
@@ -22,15 +24,22 @@ import java.util.Map;
 @Service
 public class VvTradeOrderConvertServiceImpl implements VvTradeOrderConvertService {
 
-
     @Autowired
     private VvPackageDao vvPackageDao;
 
+    @Autowired
+    private VvPackageService vvPackageService;
 
     @Override
     public List<VVOrderListResp> convertTradeOrderLineResp(List<VvTradeOrderEntity> vvTradeOrderEntities,
                                                            List<VvTradeOrderLineEntity> list) {
         List<String> trackNumbers = SanUtils.list2listFilterNull(list, VvTradeOrderLineEntity::getTrackNumber);
+        if(CollectionUtils.isNotEmpty(trackNumbers)){
+            for (String trackNumber : trackNumbers) {
+                vvPackageService.selectVvKuaidiAndUpdateData(trackNumber, RoleEnums.admin.getRole());
+            }
+        }
+
         Map<String, VvPackageEntity> vvPackageEntityMap = new HashMap<>();
         if (CollectionUtils.isNotEmpty(trackNumbers)) {
             List<VvPackageEntity> packageEntities = vvPackageDao.selectVvPackageByTrackNumbers(trackNumbers);
@@ -50,7 +59,6 @@ public class VvTradeOrderConvertServiceImpl implements VvTradeOrderConvertServic
                     vvTradeOrderLineEntityList.add(tradeOrderLineEntity);
                 }
             }
-
             /***
              * 订单行信息
              */

api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java

@@ -103,7 +103,6 @@ public class AdminOrderController {
         List<Long> tradeOrderIds = SanUtils.list2listFilterNull(vvTradeOrderLineEntities, VvTradeOrderLineEntity::getTradeOrderId);
         List<VvTradeOrderEntity> tradeOrderEntities = vvTradeOrderDao.selectVvTradeOrderByTradeOrderIds(tradeOrderIds);
 
-
         // 对订单进行排序，必须按照子单的顺序
         Map<Long, VvTradeOrderEntity> vvTradeOrderEntityMap = SanUtils.list2Map(tradeOrderEntities, VvTradeOrderEntity::getId);
         List<VvTradeOrderEntity> vvTradeOrderEntities = new ArrayList<>();
@@ -147,7 +146,9 @@ public class AdminOrderController {
     public R detail(@RequestBody VVOrderDetailRequest request) {
         VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(request.getTradeOrderId());
         List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderId(request.getTradeOrderId());
+
         List<VvTradeOrderEntity> vvTradeOrderEntities = SanUtils.asList(vvTradeOrderEntity);
+
         List<VVOrderListResp> vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(vvTradeOrderEntities, vvTradeOrderLineEntityList);
 
         VVOrderDetailResp vvOrderDetailResp = new VVOrderDetailResp();
@@ -157,7 +158,7 @@ public class AdminOrderController {
         VvBuyerEntity vvBuyerEntity = vvBuyerDao.selectVvBuyerById(vvTradeOrderEntity.getBuyerId());
         vvOrderDetailResp.setVvBuyerEntity(vvBuyerEntity);
 
-        return R.ok();
+        return R.ok().setData(vvOrderDetailResp);
     }