xdd

fs-admin/src/main/java/com/fs/live/controller/LiveOrderController.java

@@ -170,45 +170,6 @@ public class LiveOrderController extends BaseController
         return toAjax(liveOrderService.updateLiveOrder(liveOrder));
     }
 
-
-//    /**
-//     * 查看物流状态
-//     * */
-//    @PreAuthorize("@ss.hasPermi('live:liveOrder:express')")
-//    @GetMapping(value = "/getExpress/{id}")
-//    public R getExpress(@PathVariable("id") String id)
-//    {
-//        LiveOrder order=liveOrderService.selectLiveOrderByOrderId(id);
-//        ExpressInfoDTO expressInfoDTO=null;
-//        if(StringUtils.isNotEmpty(order.getDeliverySn())){
-//            String lastFourNumber = "";
-//            if (order.getDeliveryCode().equals(ShipperCodeEnum.SF.getValue())) {
-//
-//                lastFourNumber = order.getUserPhone();
-//                if (lastFourNumber.length() == 11) {
-//                    lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
-//                }else if (lastFourNumber.length()>11){
-//                    String jm = decryptPhone(lastFourNumber);
-//                    lastFourNumber = StrUtil.sub(jm, jm.length(), -4);
-//                }
-//            }
-//            expressInfoDTO=expressService.getExpressInfo(order.getOrderCode(),order.getDeliveryCode(),order.getDeliverySn(),lastFourNumber);
-//
-//            if((expressInfoDTO.getStateEx()!=null&&expressInfoDTO.getStateEx().equals("0"))&&(expressInfoDTO.getState()!=null&&expressInfoDTO.getState().equals("0"))){
-//                lastFourNumber = "19923690275";
-//                if (order.getDeliveryCode().equals(ShipperCodeEnum.SF.getValue())) {
-//                    if (lastFourNumber.length() == 11) {
-//                        lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
-//                    }
-//                }
-//
-//                expressInfoDTO=expressService.getExpressInfo(order.getOrderCode(),order.getDeliveryCode(),order.getDeliverySn(),lastFourNumber);
-//
-//            }
-//        }
-//        return R.ok().put("data",expressInfoDTO);
-//    }
-
     /**
      * 支付订单
      * */
@@ -246,53 +207,6 @@ public class LiveOrderController extends BaseController
         return liveOrderService.syncExpress(id);
     }
 
-//    @Log(title = "同步管易物流单号", businessType = BusinessType.UPDATE)
-//    @PreAuthorize("@ss.hasPermi('live:liveOrder:updateErpOrder')")
-//    @PostMapping("/updateErpOrder")
-//    public R updateErpOrder( @RequestBody LiveOrder param) {
-//        LiveOrder order = liveOrderService.selectLiveOrderByOrderId(String.valueOf(param.getOrderId()));
-//        ErpOrderQueryRequert request = new ErpOrderQueryRequert();
-//        IErpOrderService erpOrderService = getErpService();
-//        request.setCode(order.getExtendOrderId());
-//        ErpOrderQueryResponse response = erpOrderService.getOrder(request);
-//        if(response.getOrders()!=null&&response.getOrders().size()>0){
-//            for(ErpOrderQuery orderQuery : response.getOrders()){
-//                if(orderQuery.getDeliverys()!=null&&orderQuery.getDeliverys().size()>0){
-//                    for(ErpDeliverys delivery:orderQuery.getDeliverys()){
-//                        if(delivery.getDelivery()&& StringUtils.isNotEmpty(delivery.getMail_no())){
-//                            //更新商订单状态
-//                            liveOrderService.updateDeliveryOrder(param.getOrderId(), delivery.getMail_no(),delivery.getExpress_code(),delivery.getExpress_name());
-//                            return R.ok();
-//                        }
-//                    }
-//
-//                }
-//            }
-//        }
-//        return R.error("未查询到快递信息");
-//    }
-//    private IErpOrderService getErpService() {
-//        FsSysConfig sysConfig = configUtil.getSysConfig();
-//        Integer erpOpen = sysConfig.getErpOpen();
-//        if (erpOpen != null && erpOpen == 1){
-//            //判断erp类型
-//            Integer erpType = sysConfig.getErpType();
-//            if (erpType != null){
-//                IErpOrderService erpOrderService = null;
-//                if (erpType == 1){
-//                    //管易
-//                    erpOrderService =  gyOrderService;
-//                } else if (erpType == 2){
-//                    //旺店通
-//                    erpOrderService =  wdtOrderService;
-//                }
-//                return erpOrderService;
-//
-//
-//            }
-//        }
-//        return null;
-//    }
 
     /**
      * 查询订单商品列表
@@ -344,6 +258,20 @@ public class LiveOrderController extends BaseController
         return R.ok().put("order", order).put("items", items).put("logs",logs).put("user",user).put("customer",customer).put("payments",payments) ;
     }
 
+    @PreAuthorize("@ss.hasPermi('live:liveOrder:query')")
+    @GetMapping(value = "/payments/{id}")
+    public R getOrderPayments(@PathVariable("id") Long id){
+        List<LiveOrderPayment> payments=orderPaymentService.selectLiveOrderPaymentByOrderId(id);
+        return R.ok().put("payments",payments);
+    }
+
+    @PreAuthorize("@ss.hasPermi('live:liveOrder:query')")
+    @GetMapping(value = "/logs/{id}")
+    public R getOrderLogs(@PathVariable("id") Long id){
+        List<LiveOrderLogs> logs=orderLogsService.selectLiveOrderLogsByOrderId(id);
+        return R.ok().put("logs",logs);
+    }
+
     @GetMapping(value = "/queryAddress/{id}")
     @PreAuthorize("@ss.hasPermi('live:liveOrder:queryAddress')")
     public R getAddress(@PathVariable("id") Long id)

fs-company/src/main/java/com/fs/company/controller/live/LiveOrderController.java

@@ -110,6 +110,14 @@ public class LiveOrderController extends BaseController
         return R.ok().put("order", order).put("items", items).put("logs",logs).put("user",user).put("customer",customer).put("payments",payments) ;
     }
 
+    @PreAuthorize("@ss.hasPermi('live:liveOrder:query')")
+    @GetMapping(value = "/payments/{id}")
+    public R getOrderPayments(@PathVariable("id") Long id){
+        List<LiveOrderPayment> payments=orderPaymentService.selectLiveOrderPaymentByOrderId(id);
+        return R.ok().put("payments",payments);
+    }
+
+
 //    @Log(title = "订单凭证上传", businessType = BusinessType.UPDATE)
 ////    @PreAuthorize("@ss.hasPermi('live:liveOrder:uploadCredentials')")
 //    @PostMapping("/uploadCredentials")

fs-service-system/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -715,6 +715,12 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
                 order.setDeliverySn(delivers.getDeliverId());
                 order.setDeliveryStatus(delivers.getStatus());
                 order.setDeliveryType(String.valueOf(delivers.getStateEx()));
+            } else {
+                order.setDeliveryCode(null);
+                order.setDeliveryName(null);
+                order.setDeliverySn(null);
+                order.setDeliveryStatus(null);
+                order.setDeliveryType(null);
             }
         }
         return liveOrders;
@@ -723,6 +729,28 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
     @Override
     public List<LiveOrderListVo> selectLiveOrderListVo(LiveOrder liveOrder) {
         List<LiveOrderListVo> liveOrders = baseMapper.selectLiveOrderListVo(liveOrder.getUserId(),liveOrder.getStatus());
+
+        Map<Long, FsStoreDelivers> byOrderIdWithTypeBatch = fsStoreDeliversMapper
+                .findByOrderIdWithTypeBatch(liveOrders.stream().map(LiveOrderListVo::getOrderId)
+                        .filter(Objects::nonNull).collect(Collectors.toList()), 1);
+
+        for (LiveOrderListVo order : liveOrders) {
+            FsStoreDelivers delivers = byOrderIdWithTypeBatch.get(order.getOrderId());
+            if(ObjectUtil.isNotNull(delivers)) {
+                order.setDeliveryCode(delivers.getDeliverSn());
+                order.setDeliveryName(delivers.getDeliverName());
+                order.setDeliverySn(delivers.getDeliverId());
+                order.setDeliveryStatus(delivers.getStatus());
+                order.setDeliveryType(String.valueOf(delivers.getStateEx()));
+            }else {
+                order.setDeliveryCode(null);
+                order.setDeliveryName(null);
+                order.setDeliverySn(null);
+                order.setDeliveryStatus(null);
+                order.setDeliveryType(null);
+            }
+
+        }
         if (liveOrders.isEmpty()) {
             return liveOrders;
         }