直播订单页面调整，订单物流信息展示

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

@@ -1,4 +1,4 @@
-package com.fs.live.controller.controller;
+package com.fs.live.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

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

@@ -1,6 +1,14 @@
 package com.fs.live.controller;
 
 import java.util.List;
+
+import cn.hutool.core.util.StrUtil;
+import com.fs.common.core.domain.R;
+import com.fs.common.utils.StringUtils;
+import com.fs.his.domain.FsStoreOrder;
+import com.fs.his.dto.ExpressInfoDTO;
+import com.fs.his.enums.ShipperCodeEnum;
+import com.fs.his.service.IFsExpressService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,9 +28,11 @@ import com.fs.live.service.ILiveOrderService;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.common.core.page.TableDataInfo;
 
+import static com.fs.his.utils.PhoneUtil.decryptPhone;
+
 /**
  * 订单Controller
- * 
+ *
  * @author fs
  * @date 2025-07-08
  */
@@ -33,6 +43,10 @@ public class LiveOrderController extends BaseController
     @Autowired
     private ILiveOrderService liveOrderService;
 
+
+    @Autowired
+    private IFsExpressService expressService;
+
     /**
      * 查询订单列表
      */
@@ -100,4 +114,43 @@ public class LiveOrderController extends BaseController
     {
         return toAjax(liveOrderService.deleteLiveOrderByOrderIds(orderIds));
     }
+
+    /**
+     * 查看物流状态
+     * */
+    @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);
+    }
+
 }

fs-service/src/main/java/com/fs/live/enums/LiveAfterSalesStatusEnum.java

@@ -0,0 +1,31 @@
+package com.fs.live.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.stream.Stream;
+
+@Getter
+@AllArgsConstructor
+public enum LiveAfterSalesStatusEnum {
+
+    STATUS_0(0,"用户提交售后"),
+    STATUS_1(1,"平台已审核"),
+    STATUS_2(2,"用户已发货"),
+    STATUS_3(3,"仓库已审核"),
+    STATUS_4(4,"财务已审核"),
+    STATUS_5(5,"用户取消售后"),
+    STATUS_6(6,"平台取消售后");
+
+
+    private Integer value;
+    private String desc;
+
+    public static LiveAfterSalesStatusEnum toType(int value) {
+        return Stream.of(LiveAfterSalesStatusEnum.values())
+                .filter(p -> p.value == value)
+                .findAny()
+                .orElse(null);
+    }
+
+}

fs-service/src/main/java/com/fs/live/enums/LiveOrderLogEnum.java

@@ -0,0 +1,44 @@
+package com.fs.live.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.stream.Stream;
+
+@Getter
+@AllArgsConstructor
+public enum LiveOrderLogEnum {
+    REFUND_ORDER_SUCCESS("refund_price_success","退款成功"),
+    ORDER_EDIT("order_edit","订单改价"),
+    REMOVE_ORDER("remove_order","删除订单"),
+    EVAL_ORDER("order_eval","用户评价"),
+    REFUND_ORDER_APPLY("apply_refund","用户申请退款"),
+    TAKE_ORDER_DELIVERY("user_take_delivery","用户已收货"),
+    PAY_ORDER_SUCCESS("pay_success","用户付款成功"),
+    PAY_REMAIN_ORDER_SUCCESS("pay_remain_success","用户付款尾款成功"),
+
+    CREATE_ORDER("create_order","订单生成"),
+    CANCEL_ORDER("cancel_order","订单已取消"),
+    NONE_ORDER("NONE","订单OK"),
+    DELIVERY_GOODS("delivery_goods", "订单发货"),
+    FINISH_ORDER("finish","确认收货"),
+    LOCK_TUI_MONEY("lock_tui_money","冻结推广金"),
+    UNLOCK_TUI_MONEY("unlock_tui_money","解冻推广金"),
+    EDIT_ORDER_PRICE("edit_order_money","改价");
+
+    private String value;
+    private String desc;
+
+
+
+    public static LiveOrderLogEnum toType(String value) {
+        return Stream.of(LiveOrderLogEnum.values())
+                .filter(p -> p.value.equals(value))
+                .findAny()
+                .orElse(null);
+    }
+
+    public static String getDesc(String value) {
+        return toType(value) == null ? null : toType(value).desc;
+    }
+}

fs-service/src/main/java/com/fs/live/enums/LiveOrderStatusEnum.java

@@ -0,0 +1,36 @@
+package com.fs.live.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.stream.Stream;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public enum LiveOrderStatusEnum {
+    STATUS_NE1(-1,"申请退款"),
+    STATUS_NE2(-2,"退货成功"),
+    STATUS_NE3(-3,"已取消"),
+    STATUS_1(1,"待支付"),
+    STATUS_2(2,"待发货"),
+    STATUS_3(3,"待收货"),
+    STATUS_4(4,"已完成"),
+
+    REFUND_STATUS_0(0,"正常"),
+    REFUND_STATUS_1(1,"退款中"),
+    REFUND_STATUS_2(2,"已退款");
+
+
+
+    private Integer value;
+    private String desc;
+
+    public static LiveOrderStatusEnum toType(int value) {
+        return Stream.of(LiveOrderStatusEnum.values())
+                .filter(p -> p.value == value)
+                .findAny()
+                .orElse(null);
+    }
+}