From 79075bdebeb9bbb35e9635440c9b8e5fdd16bea7 Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Tue, 3 Sep 2024 15:44:02 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=AE=A2=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=90=8C=E6=AD=A5=E5=85=8D=E6=8A=BC=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/controller/OrderPayController.java    | 18 +++++++++++++++---
 .../com/gxwebsoft/shop/entity/OrderPay.java    |  4 ++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderPayController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderPayController.java
index 92f9ced..240fafb 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/OrderPayController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/OrderPayController.java
@@ -80,8 +80,19 @@ public class OrderPayController extends BaseController {
         PageParam<OrderPay, OrderPayParam> page = new PageParam<>(param);
         page.setDefaultOrder("create_time desc");
         //return success(orderPayService.list(page.getOrderWrapper()));
+        List<OrderPay> orderPays =  orderPayService.listRel(param);
+
+        if (null != param.getRentOrderId() && 0 != param.getRentOrderId()) {//如果是单个查询
+            Order order = orderService.getById(param.getRentOrderId());
+            if (null != order && !orderPays.isEmpty()) {
+                orderPays.forEach(orderPay -> {
+                    orderPay.setIsCreditAuth(order.getIsCreditAuth());//小程序端用于判断是否显示芝麻信用免押
+                    orderPay.setIsFreeze(order.getIsFreeze());
+                });
+            }
+        }
         // 使用关联查询
-        return success(orderPayService.listRel(param));
+        return success(orderPays);
     }
 
     @GetMapping("/{id}")
@@ -166,6 +177,7 @@ public class OrderPayController extends BaseController {
             orderPayService.save(one);
         }
         one.setIsFreeze(order.getIsFreeze());
+        one.setIsCreditAuth(order.getIsCreditAuth());
         one.setIsRenew(isRenew);
 
         if (isRenew == null || isRenew == 0) {
@@ -236,9 +248,9 @@ public class OrderPayController extends BaseController {
         order.setExpirationTime(orderPay.getExpirationTime());
         orderService.updateById(order);
 
-        OrderPay olderPay =  orderPayService.getOne(Wrappers.lambdaQuery(OrderPay.class).eq(OrderPay::getOrderNo,orderPay.getOrderNo()));
+        OrderPay olderPay = orderPayService.getOne(Wrappers.lambdaQuery(OrderPay.class).eq(OrderPay::getOrderNo, orderPay.getOrderNo()));
         OrderPay newOrderPay = new OrderPay();
-        BeanCopier.create(olderPay, newOrderPay, CopyOptions.create().ignoreNullValue().setIgnoreProperties("id","orderNo")).copy();
+        BeanCopier.create(olderPay, newOrderPay, CopyOptions.create().ignoreNullValue().setIgnoreProperties("id", "orderNo")).copy();
 
 
         newOrderPay.setOrderPrice(BigDecimal.valueOf(orderPay.getOrderPriceInt()));
diff --git a/src/main/java/com/gxwebsoft/shop/entity/OrderPay.java b/src/main/java/com/gxwebsoft/shop/entity/OrderPay.java
index 0412368..bf8ff93 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/OrderPay.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/OrderPay.java
@@ -184,6 +184,10 @@ public class OrderPay implements Serializable {
     @TableField(exist = false)
     private Integer isFreeze;
 
+    @ApiModelProperty(value = "信用预授权,即免押模式，0：非免押，1免押")
+    @TableField(exist = false)
+    private Integer isCreditAuth;
+
     @ApiModelProperty(value = "是否续费单")
     @TableField(exist = false)
     private Integer isRenew;