From 1a4c3f95db84ba6d36dfe18d273bd06ecc9ced70 Mon Sep 17 00:00:00 2001
From: DB <2502523450@qq.com>
Date: Mon, 13 Nov 2023 19:46:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cpop/mall/business/service/impl/OrderRefundServiceImpl.java | 2 +-
 .../com/cpop/mall/business/service/impl/OrderServiceImpl.java   | 2 +-
 .../com/cpop/mall/business/service/impl/ProductServiceImpl.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderRefundServiceImpl.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderRefundServiceImpl.java
index 757a52c..56a7282 100644
--- a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderRefundServiceImpl.java
+++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderRefundServiceImpl.java
@@ -132,7 +132,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                         .set("user_id", userPoint.getOldUserId())
                         .set("brand_id", userPoint.getBrandCloudId())
                         .set("point_behaviour", 9)
-                        .set("behaviour_record", "商城购买商品")
+                        .set("behaviour_record", "商城退款商品返回积分")
                         .set("point_change", order.getTotalPoint())
                         .set("point_time", now)
                         .set("cumulative", userPoint.getTotalPoint() + order.getTotalPoint())
diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderServiceImpl.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderServiceImpl.java
index f193d75..2781c55 100644
--- a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderServiceImpl.java
+++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderServiceImpl.java
@@ -590,7 +590,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     public void inputLogisticsOrder(LogisticsOrderBo bo) {
         this.updateChain().setRaw(ORDER.PREVIOUS_STATUS, ORDER.ORDER_STATUS)
-                .set(ORDER.ORDER_STATUS, 3)
+                .set(ORDER.ORDER_STATUS, 2)
                 .set(ORDER.LOGISTICS_ORDER, bo.getLogisticsOrder())
                 .where(ORDER.ID.eq(bo.getId())).update();
     }
diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ProductServiceImpl.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ProductServiceImpl.java
index 999bbd0..63b90d6 100644
--- a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ProductServiceImpl.java
+++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ProductServiceImpl.java
@@ -347,7 +347,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
                     .leftJoin("t_brand_info").as("tbi").on("tbi.id = tct.brand_id")
                     .where("tbi.brand_id = ?", brandExtend.getBrandCloudId())
                     .or("tct.brand_id = ?", brandExtend.getBrandCloudId())
-                    .and("tct.pay_type = 0")
+                    .like("tct.pay_type", 0)
                     //未被删除的模板
                     .and("tct.deleted = 1")
                     .orderBy("tct.creation_time", false));