Merge remote-tracking branch 'origin/master'

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/ExpenseFlow.java

@@ -26,7 +26,9 @@ import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 消费流水 / 消费订单
@@ -288,4 +290,21 @@ public class ExpenseFlow extends SuperMain {
         this.paymentTime = DateUtils.paresTime(System.currentTimeMillis(), DateUtils.patternyyyySSS);
     }
     //------------------------------时间信息 end----------------------
+
+    @Schema(description = "扩展字段")
+    private Map<String, Object> metaInfo = new HashMap<>();
+
+    public void addMetaInfo(String key, Object value) {
+        if (metaInfo == null) {
+            metaInfo = new HashMap<>();
+        }
+        metaInfo.put(key, value);
+    }
+
+    public Object getMetaInfo(String key) {
+        if (metaInfo != null && metaInfo.containsKey(key)) {
+            return metaInfo.get(key);
+        }
+        return null;
+    }
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/OrderService.java

@@ -110,6 +110,7 @@ public class OrderService extends SuperService {
         orderParam.setAppointPaymentType(Boolean.TRUE);
         orderParam.setPaymentType(PaymentType.WeChatPay);
 
+        // 创建订单 （判断是否创建成功）
         ResultContent<ExpenseFlow> content = expenseFlowService.createOrder(orderParam, expenseFlow);
         expenseFlow = expenseFlowService.saveInfo(expenseFlow);
         if (!expenseFlow.getVerifyParamIsSuccess()) {