Ver código fonte

小程序调试

skyline 2 meses atrás
pai
commit
b9c3a084ed

+ 2 - 0
haha-miniapp/src/main/java/com/haha/miniapp/controller/OrderController.java

@@ -60,6 +60,7 @@ public class OrderController {
                 Map<String, Object> orderMap = new HashMap<>();
                 orderMap.put("id", order.getId());
                 orderMap.put("orderNo", order.getOrderNo());
+                orderMap.put("orderName", order.getOrderName() != null ? order.getOrderName() : "");
                 orderMap.put("outTradeNo", order.getOutTradeNo());
                 orderMap.put("deviceId", order.getDeviceId());
                 orderMap.put("totalAmount", order.getTotalAmount());
@@ -157,6 +158,7 @@ public class OrderController {
             Map<String, Object> orderDetail = new HashMap<>();
             orderDetail.put("id", order.getId());
             orderDetail.put("orderNo", order.getOrderNo());
+            orderDetail.put("orderName", order.getOrderName() != null ? order.getOrderName() : "");
             orderDetail.put("outTradeNo", order.getOutTradeNo());
             orderDetail.put("deviceId", order.getDeviceId());
             orderDetail.put("totalAmount", order.getTotalAmount());

+ 1 - 0
haha-mp/src/api/order.ts

@@ -22,6 +22,7 @@ export interface OrderProduct {
 export interface OrderInfo {
   id: number;
   orderNo: string;
+  orderName?: string; // 订单名称
   outTradeNo: string;
   hahaOrderNo: string;
   deviceId: string;

+ 4 - 0
haha-mp/src/pages/orderDetail/orderDetail.vue

@@ -61,6 +61,10 @@
           <text class="card-title">订单信息</text>
         </view>
         <view class="info-list">
+          <view class="info-row" v-if="order.orderName">
+            <text class="info-label">订单名称</text>
+            <text class="info-value">{{ order.orderName }}</text>
+          </view>
           <view class="info-row">
             <text class="info-label">订单编号</text>
             <view class="info-value-group">

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

@@ -246,9 +246,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     public List<Order> getOrderListByUserId(Long userId, Integer status) {
         if (status != null) {
-            return lambdaQuery().eq(Order::getUserId, userId).eq(Order::getStatus, status).list();
+            return lambdaQuery()
+                .eq(Order::getUserId, userId)
+                .eq(Order::getStatus, status)
+                .orderByDesc(Order::getId)
+                .list();
         } else {
-            return lambdaQuery().eq(Order::getUserId, userId).list();
+            return lambdaQuery()
+                .eq(Order::getUserId, userId)
+                .orderByDesc(Order::getId)
+                .list();
         }
     }