From f8c253e532fcf9f76e02e5e0ede6b4300af44929 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 23 Oct 2025 09:55:19 +0800
Subject: [PATCH] fix(aiApply): 更新权限控制标识 - 将同意、拒绝、解绑按钮的权限标识从 companyList:info 更改为 applyList:view - 确保操作按钮权限控制与实际功能匹配 - 修复因权限标识不一致导致的功能不可用问题
---
src/main/resources/mapper/modules/ClothesOrderMapper.xml | 74 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/ClothesOrderMapper.xml b/src/main/resources/mapper/modules/ClothesOrderMapper.xml
index 7e48374..40b1e40 100644
--- a/src/main/resources/mapper/modules/ClothesOrderMapper.xml
+++ b/src/main/resources/mapper/modules/ClothesOrderMapper.xml
@@ -10,9 +10,12 @@
a.status as status,
b.name as typeName,
b.image as typeImage,
+ c.express_no as expressNo,
+ c.express_com as expressCom,
a.goods_cnt as goodsCnt
- from clothes_order_graft a
+ from clothes_order a
left join clothes_type b on a.type_id = b.id
+ left join mall_express_info c on a.id=c.order_id
<where>
and a.member_id = #{record.memberId}
<if test="record != null">
@@ -21,7 +24,7 @@
b.name like CONCAT('%', CONCAT(#{record.query}, '%')) or
)
</if>
- <if test="record.status != null">
+ <if test="record.status != 0">
and (
a.status = #{record.status}
)
@@ -31,4 +34,71 @@
order by a.CREATED_TIME desc
</select>
+ <select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.clothes.AdminClothesOrderListVo">
+ select
+ a.id as id,
+ a.type_id as typeId,
+
+ c.name as memberName,
+ b.name as typeName,
+ b.image as typeImage,
+
+ a.order_no as orderNo,
+ a.order_time as orderTime,
+ a.goods_cnt as goodsCnt,
+ a.status as status,
+ a.remark as remark,
+
+ a.pay_time as payTime,
+ a.pay_method as payMethod,
+ a.pay_order_no as payOrderNo,
+ a.pay_result as payResult,
+
+ a.delivery_state as deliveryState,
+
+ a.amount as amount,
+ a.discount_amount as discountAmount,
+ a.carriage as carriage,
+ a.real_amount as realAmount,
+ a.comment_state as commentState
+ from clothes_order a
+ left join clothes_type b on a.type_id = b.id
+ left join mall_member c on a.member_id = c.id
+
+ <where>
+ <if test="record != null">
+ <if test="record.payResult != null and record.payResult != ''">
+ and a.pay_result = #{record.payResult}
+ </if>
+ <if test="record.status != null">
+ and a.status = #{record.status}
+ </if>
+ <if test="record.orderNo != null and record.orderNo != ''">
+ and a.order_no like CONCAT('%', CONCAT(#{record.orderNo}, '%'))
+ </if>
+ <if test="record.name != null and record.name != ''">
+ and c.name like CONCAT('%', CONCAT(#{record.name}, '%'))
+ </if>
+ <if test="record.startTime != null and record.startTime != ''">
+ and a.order_time >= #{record.startTime}
+ </if>
+ <if test="record.endTime != null and record.endTime != ''">
+ and a.order_time <= #{record.endTime}
+ </if>
+ </if>
+ </where>
+ order by a.created_time desc
+ </select>
+
+
+
+ <select id="selectOrderStatusCnt" resultType="java.util.Map">
+ select
+ a.status,
+ count(1) cnt
+ from clothes_order a
+ where a.del_flag=0 and a.member_id=#{memberId}
+ group by a.status
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1