From 6547768b341b9f28131e68ecc7a73d34819d8280 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 18 Dec 2025 14:10:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysRoleTemplateServiceImpl.java    |  2 +-
 .../com/czg/service/order/mapper/GbOrderMapper.java |  5 +++--
 .../src/main/resources/mapper/GbOrderMapper.xml     | 13 +++++--------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java
index addd9cfa8..ee1b5e6b9 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java
@@ -34,7 +34,7 @@ public class SysRoleTemplateServiceImpl extends ServiceImpl<SysRoleTemplateMappe
         SysRoleTemplate roleTemplate = BeanUtil.copyProperties(dto, SysRoleTemplate.class, "roleIdList");
         roleTemplate.setOpUser(StpKit.USER.getAccount());
         if (roleTemplate.getPid() != null) {
-            SysRole sysRole = new SysRole().setName(roleTemplate.getName()).setCreateUserId(StpKit.USER.getLoginIdAsLong());
+            SysRole sysRole = new SysRole().setName(roleTemplate.getName()).setCreateUserId(StpKit.USER.getShopId());
             roleService.save(sysRole);
             roleTemplate.setRoleId(sysRole.getId());
         }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java
index e9f35d0ef..5f554be51 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java
@@ -6,6 +6,7 @@ import com.czg.order.vo.GbOrderDetailVO;
 import com.czg.order.vo.GbOrderUserVO;
 import com.mybatisflex.core.BaseMapper;
 import com.czg.order.entity.GbOrder;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,9 +18,9 @@ import java.util.List;
  */
 public interface GbOrderMapper extends BaseMapper<GbOrder> {
 
-    GbOrderCountVO countOrder(GbOrderQueryParam param);
+    GbOrderCountVO countOrder(@Param("param") GbOrderQueryParam param);
 
-    List<GbOrderDetailVO> getGbOrderPage(GbOrderQueryParam param, Long shopId, Long mainShopId);
+    List<GbOrderDetailVO> getGbOrderPage(@Param("param")GbOrderQueryParam param, Long shopId, Long mainShopId);
 
     GbOrderDetailVO getDetailByDetailId(Long mainShopId, Long shopId, Long detailId);
 
diff --git a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
index 5f91267ee..24a02397f 100644
--- a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
@@ -20,13 +20,11 @@
         <if test="param.groupOrderNo != null">
             AND detail.group_order_no = #{param.groupOrderNo}
         </if>
-        <if test="param.status != null">
-            <if test="param.status == '退款'">
-                AND (detail.STATUS = '退款中' or detail.STATUS = '已退款')
-            </if>
-            <if test="param.status != '退款'">
-                AND detail.STATUS = #{param.status}
-            </if>
+        <if test='param.status == "退款"'>
+            AND (detail.STATUS = '退款中' or detail.STATUS = '已退款')
+        </if>
+        <if test='param.status != "退款"'>
+            AND detail.STATUS = #{param.status}
         </if>
         <if test="param.userId != null">
             AND detail.user_id = #{param.userId}
@@ -37,7 +35,6 @@
         <if test="param.verifyStartTime != null and param.verifyEndTime != null ">
             and detail.verify_time BETWEEN #{param.verifyStartTime} and #{param.verifyEndTime}
         </if>
-        order by detail.create_time desc
     </select>
 
     <select id="getGbOrderPage" resultType="com.czg.order.vo.GbOrderDetailVO">