订单金额展示问题修复

admin-web/src/views/admin/ordering/index.vue

@@ -115,8 +115,11 @@
             <template v-else-if="field.prop==='payStatus'">
               <ext-d-label type="Order.pay" :model-value="row[field.prop]"></ext-d-label>
             </template>
+            <template v-else-if="field.prop==='closeType'">
+              <ext-d-label type="Order.closeType" :model-value="row[field.prop]"></ext-d-label>
+            </template>
             <template v-else-if="['prepayMoney','amount','amountReceivable','amountReceived','cardBalance','coinMoney','discountAmount','discountMoney'].includes(field.prop)">
-              {{ u.fmt.fmtMoney(row[row.prop]) }}
+              {{ u.fmt.fmtMoney(row[field.prop]) }}
             </template>
             <template v-else-if="field.prop==='idleRemainTime'||field.prop==='operationRemainTime'">
               {{ u.fmt.fmtDuration(row[field.prop]) }}

car-wash-common/src/main/java/com/kym/common/R.java

@@ -4,6 +4,7 @@ import com.kym.common.constant.ResponseEnum;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.slf4j.MDC;
 
 import java.io.Serializable;
 
@@ -22,10 +23,19 @@ public class R<T> implements Serializable {
     private Integer code;
     private String message;
     private T data;
+    private String tid;
 
     public R(Integer code, String message) {
         this.code = code;
         this.message = message;
+        this.tid = MDC.get("seq");
+    }
+
+    public R(Integer code, String message, T data) {
+        this.code = code;
+        this.message = message;
+        this.data =data;
+        this.tid = MDC.get("seq");
     }
 
     public static R success() {