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

修改

This commit is contained in:
Lenovo 2024-07-10 17:48:43 +08:00
parent 96cdf875b2
commit fc5811117a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusBanOperateController.java
View File

@ -92,7 +92,7 @@ public class BusBanOperateController extends BaseController
BusOrderInfo busOrderInfo = iBusOrderInfoService.selectBusOrderInfoById(orderId); BusOrderInfo busOrderInfo = iBusOrderInfoService.selectBusOrderInfoById(orderId);
busBanOperateInfo.setStoreCode(busOrderInfo.getStoreCode()); busBanOperateInfo.setStoreCode(busOrderInfo.getStoreCode());
busBanOperateInfo.setStoreName(busOrderInfo.getStoreName()); busBanOperateInfo.setStoreName(busOrderInfo.getStoreName());
busBanOperateInfo.setBanOperateCode(busOrderInfo.getOrderNo()); busBanOperateInfo.setBanOperateCode(busOrderInfo.getCustomId());
busBanOperateInfo.setBindOrderCode(busOrderInfo.getId()+""); busBanOperateInfo.setBindOrderCode(busOrderInfo.getId()+"");
busBanOperateInfoList.add(busBanOperateInfo); busBanOperateInfoList.add(busBanOperateInfo);
} }

2
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
View File

@ -200,7 +200,7 @@ public class RyTask {
//加入免运营订单-黑名单的 不营销跳出 //加入免运营订单-黑名单的 不营销跳出
BusBanOperateInfo busBanOperateInfo = new BusBanOperateInfo(); BusBanOperateInfo busBanOperateInfo = new BusBanOperateInfo();
busBanOperateInfo.setBindOrderCode(busOrderInfo.getId()+""); busBanOperateInfo.setBanOperateCode(busOrderInfo.getCustomId());
busBanOperateInfo.setBanStatus("1"); busBanOperateInfo.setBanStatus("1");
List<BusBanOperateInfo> list1 = iBusBanOperateInfoService.selectBusBanOperateInfoList(busBanOperateInfo); List<BusBanOperateInfo> list1 = iBusBanOperateInfoService.selectBusBanOperateInfoList(busBanOperateInfo);
if(list1.size() > 0){ if(list1.size() > 0){

2
ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
View File

@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="lastUserIntegralNum" parameterType="java.lang.String" resultType="java.lang.Integer"> <select id="lastUserIntegralNum" parameterType="java.lang.String" resultType="java.lang.Integer">
select count(integral_update_num) from bus_integral_record select count(integral_update_num) from bus_integral_record
where account = #{agentAccount} and update_type = '消耗账分' where account = #{agentAccount} and update_type = '消耗账分'
and internal_update_time between #{startTime} and #{endTime} and integral_update_time between #{startTime} and #{endTime}
</select> </select>
<select id="selectBusStoreInfoList" parameterType="BusStoreInfo" resultMap="BusStoreInfoResult"> <select id="selectBusStoreInfoList" parameterType="BusStoreInfo" resultMap="BusStoreInfoResult">