From 9a931a8d1fc5510978ec758050fc88d60eccf9de Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Tue, 27 Aug 2024 13:46:39 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=94=AF=E4=BB=98=E5=AE=9D?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=8D=E6=8A=BC=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gxwebsoft/shop/controller/FreezeOrderController.java   | 3 +++
 src/main/java/com/gxwebsoft/shop/entity/Order.java             | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/main/java/com/gxwebsoft/shop/controller/FreezeOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/FreezeOrderController.java
index 8e59031..a433aa5 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/FreezeOrderController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/FreezeOrderController.java
@@ -320,6 +320,9 @@ public class FreezeOrderController extends BaseController {
             }
             log.info("订单{}已支付押金！", orderId);
             order.setIsFreeze(1);
+            if ("CREDIT_AUTH".equals(response.getPreAuthType())){
+                order.setIsCreditAuth(1);//信用预授权，即免押模式
+            }
             orderService.updateById(order);
         }
 
diff --git a/src/main/java/com/gxwebsoft/shop/entity/Order.java b/src/main/java/com/gxwebsoft/shop/entity/Order.java
index 2d1f968..4b2b0c6 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/Order.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/Order.java
@@ -126,6 +126,9 @@ public class Order implements Serializable {
     @ApiModelProperty(value = "是否交押金")
     private Integer isFreeze;
 
+    @ApiModelProperty(value = "信用预授权,即免押模式，0：非免押，1免押")
+    private Integer isCreditAuth;
+
     @ApiModelProperty(value = "发货时间")
     private Date deliveryTime;