修改用户端获取订单详情返回发票状态

ruoyi-admin/src/main/java/com/ruoyi/app/order/OrderInvoiceService.java

@@ -197,8 +197,6 @@ public class OrderInvoiceService {
             vo.setOrderId(orderId);
             vo.setOrderNo(order.getDdId());
             vo.setInvoiceStatus(can ? STATUS_NOT_ISSUED : null);
-        } else if (!can) {
-            vo.setInvoiceStatus(null);
         }
         return vo;
     }

ruoyi-admin/src/main/java/com/ruoyi/app/order/PosOrderController.java

@@ -35,6 +35,7 @@ import com.ruoyi.framework.manager.AsyncManager;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.domain.vo.OrderDTO;
+import com.ruoyi.system.domain.vo.PosOrderInvoiceVo;
 import com.ruoyi.system.mapper.PosFoodMapper;
 import com.ruoyi.system.mapper.PosOrderMapper;
 import com.ruoyi.system.mapper.PosOrderPromotionMapper;
@@ -142,6 +143,9 @@ public class PosOrderController extends BaseController {
     @Autowired
     private PosOrderPromotionMapper posOrderPromotionMapper;
 
+    @Autowired
+    private OrderInvoiceService orderInvoiceService;
+
 
     //查询用户足迹
     @Anonymous
@@ -644,6 +648,9 @@ public class PosOrderController extends BaseController {
         // 查询促销快照明细
         List<PosOrderPromotion> promotions = posOrderPromotionMapper.selectByOrderId(orlist.getId());
         org.put("promotions", promotions);
+        // 查询发票状态（null=未申请，0未开/1已开/2失败/3作废）
+        PosOrderInvoiceVo invoice = orderInvoiceService.detail(orlist.getId());
+        org.put("invoiceStatus", invoice == null ? null : invoice.getInvoiceStatus());
         return success(org);
     }