Merge remote-tracking branch 'remotes/origin/feature/1.9.28_单接受scene保存'

# Conflicts:
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -195,6 +195,8 @@ public class CreateOrderVo {
 
     @ApiModelProperty(hidden = true)
     private String sessionKey; // 存储sessionKey,异常补退使用
+    @ApiModelProperty(hidden = true)
+    private String scene;// 打开小程序的场景值
 
     @Builder.Default
     private String menuType = "saas";

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1927,6 +1927,9 @@ public class OrderServiceImpl implements Orderservice {
         orderExtInfoDto.setSessionKey(createOrderVo.getSessionKey());
         orderExtInfoDto.setFormId(createOrderVo.getFormId());
         orderExtInfoDto.setFromAppId(userLoginInfoDto.getWxAppId());
+        if (StringUtils.isNotBlank(createOrderVo.getScene())) {
+            orderExtInfoDto.setScene(createOrderVo.getScene());
+        }
         return orderExtInfoDto;
     }
 

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

@@ -14,8 +14,6 @@ package com.freemud.application.sdk.api.ordercenter.request;
 
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 public class OrderExtInfoDto {
 
@@ -138,4 +136,8 @@ public class OrderExtInfoDto {
      * 出场时间
      */
     private String outTime;
+    /**
+     * 打开小程序的场景值。
+     */
+    private String scene;
 }