dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
齐天大圣 2024-10-31 10:20:48 +08:00
parent f9edc8af57
commit 2c68d58198
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/src/api/allOrder.js
View File

@ -220,7 +220,7 @@ export function getDicts(dictType) {
export function getStaffByStorId() { export function getStaffByStorId() {
return request({ return request({
url: '/business/allOrderInfo/getStaffByStorId', url: '/business/allOrderInfo/getStaffByStorId',
method: 'get' method: 'post'
}) })
} }

19
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
View File

@ -870,12 +870,25 @@
all_order_info ai all_order_info ai
LEFT JOIN mt_user mu ON ai.user_id = mu.id LEFT JOIN mt_user mu ON ai.user_id = mu.id
LEFT JOIN merchant_config mc on mc.id = ai.m_id LEFT JOIN merchant_config mc on mc.id = ai.m_id
<where> where
<if test="obj.storeId != null and obj.storeId != ''"> <if test="obj.storeId != null and obj.storeId != ''">
ai.store_id = #{obj.storeId} ai.store_id = #{obj.storeId}
</if> </if>
<if test="obj.storeId != null and obj.storeId != ''">
</where> and ai.store_id = #{obj.storeId}
</if>
<if test="obj.orderNo != null and obj.orderNo != ''">
and ai.order_no like concat('%', #{obj.orderNo}, '%')
</if>
<if test="obj.payType != null and obj.payType != ''">
and ai.pay_type = #{obj.payType}
</if>
<if test="obj.type != null and obj.type != ''">
and ai.type = #{obj.type}
</if>
<if test="obj.payChannel != null and obj.payChannel != ''">
and ai.pay_channel = #{obj.payChannel}
</if>
ORDER BY ai.create_time DESC ORDER BY ai.create_time DESC
</select> </select>
<select id="orderStatistics" resultType="java.util.Map"> <select id="orderStatistics" resultType="java.util.Map">