wangshuai
/
youshi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1; 查询订单

This commit is contained in:
wangshuai 2024-07-31 02:41:05 +08:00
parent 795b2e6955
commit 1a7494076c
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-admin/src/main/resources/application.yml
View File

@ -79,14 +79,18 @@ spring:
# redis 配置
redis:
# 地址
host: 49.232.250.68
host: 43.140.224.18
# host: 49.232.250.68
# host: localhost
# 端口，默认为6379
port: 16379
port: 6379
# port: 16379
# 数据库索引
database: 0
# 密码
password: MjJUyaRZ_HDgZ2w_6XxK
password: xxhy@2024
# password: MjJUyaRZ_HDgZ2w_6XxK
# password:
# 连接超时时间
timeout: 10s
lettuce:

2
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java
View File

@ -109,6 +109,8 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService
return busStoreInfoMapper.updateBusStoreInfo(busStoreInfo);
}
@Override
@Transactional
public int changeReturnVisitStatus(BusStoreInfo busStoreInfo)
{
LoginUser loginUser = SecurityUtils.getLoginUser();

30
ruoyi-system/src/main/resources/mapper/business/BusOrderInfoMapper.xml
View File

@ -52,14 +52,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT t1.*
FROM bus_order_info AS t1
JOIN (
select a.order_no,min(a.id) AS min_id
from bus_order_info a
LEFT JOIN bus_return_visit_info b on b.phone_number=a.privcy_phone
where b.return_visit_time is null
<if test="storeCode != null and storeCode != ''"> and a.store_code = #{storeCode}</if>
<if test="t1 != null and t1 != ''"> and a.complete_time &gt; #{t1}</if>
<if test="t2 != null and t2 != ''"> and a.complete_time &lt;= #{t2}</if>
GROUP BY a.order_no
select a.privcy_phone,a.order_no,min(a.id) AS min_id
from bus_return_visit_info b
LEFT JOIN bus_order_info a on b.phone_number=a.privcy_phone
where b.return_visit_time is null and b.phone_number != ''
and a.store_code = #{storeCode}
and a.complete_time &gt; #{t1}
and a.complete_time &lt;= #{t2}
GROUP BY a.privcy_phone,a.order_no
) AS t2 ON t1.order_no = t2.order_no AND t1.id = t2.min_id;
</select>
@ -67,13 +67,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT t1.*
FROM bus_order_info AS t1
JOIN (
select a.order_no,min(a.id) AS min_id
from bus_order_info a
LEFT JOIN bus_return_visit_info b on b.phone_number=a.privcy_phone
where b.return_visit_time is null
<if test="storeCode != null and storeCode != ''"> and a.store_code = #{storeCode}</if>
<if test="t2 != null and t2 != ''"> and a.order_time &lt;= #{t2}</if>
GROUP BY a.order_no
select a.privcy_phone,a.order_no,min(a.id) AS min_id
from bus_return_visit_info b
LEFT JOIN bus_order_info a on b.phone_number=a.privcy_phone
where b.return_visit_time is null and b.phone_number != ''
and a.store_code = #{storeCode}
and a.order_time &lt;= #{t2}
GROUP BY a.privcy_phone,a.order_no
) AS t2 ON t1.order_no = t2.order_no AND t1.id = t2.min_id;
</select>
<select id="selectBusOrderInfoListA" resultMap="BusOrderInfoResult">