Quellcode durchsuchen

fix: 门店名称在列表和详情中正常显示

- 前端列表改用storeName(DB字段),shopName为@TableField(exist=false)非DB列
- OrderVO.getShopName优先取storeName再取shopName
- createOrderFromRecognition同时设置shopName和storeName

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
skyline vor 2 Wochen
Ursprung
Commit
b1ea6d9f2b

+ 2 - 2
haha-admin-web/src/views/order/utils/hook.tsx

@@ -76,9 +76,9 @@ export function useOrder(tableRef: Ref) {
     },
     {
       label: "门店名称",
-      prop: "shopName",
+      prop: "storeName",
       minWidth: 120,
-      formatter: ({ shopName }) => shopName || "-"
+      formatter: ({ storeName }) => storeName || "-"
     },
     {
       label: "设备 ID",

+ 2 - 1
haha-service/src/main/java/com/haha/service/impl/OrderServiceImpl.java

@@ -193,7 +193,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         vo.setPayTime(order.getPayTime());
         vo.setVideoUrl(order.getVideoUrl());
         vo.setConfidence(order.getConfidence());
-        vo.setShopName(order.getShopName());
+        vo.setShopName(order.getStoreName() != null ? order.getStoreName() : order.getShopName());
         vo.setDeviceName(order.getDeviceName());
         vo.setPayType(order.getPayType());
 
@@ -445,6 +445,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     Shop shop = shopMapper.selectById(device.getShopId());
                     if (shop != null) {
                         order.setStoreName(shop.getName());
+                        order.setShopName(shop.getName());
                     }
                 }
             } catch (Exception e) {