czg_team
/
video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
GYJ 2024-12-31 15:49:57 +08:00
parent f74e29c09f 9160bf0a56
commit 48f605ecb1
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
View File

@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sqx.common.utils.DateUtils; import com.sqx.common.utils.DateUtils;
import com.sqx.modules.app.entity.InviteAchievement; import com.sqx.modules.app.entity.InviteAchievement;
import com.sqx.modules.app.entity.UserEntity; import com.sqx.modules.app.entity.UserEntity;
@ -98,7 +99,7 @@ public class TempOrdersTask {
for (Orders order : orders) { for (Orders order : orders) {
ThreadUtil.sleep(100); ThreadUtil.sleep(100);
PayDetails payDetails = payDetailsDao.selectByOrderId(order.getOrdersNo()); PayDetails payDetails = payDetailsDao.selectOneByLimit(order.getOrdersNo());
if (payDetails == null) { if (payDetails == null) {
order.setStatus(3); order.setStatus(3);
ordersDao.updateById(order); ordersDao.updateById(order);

3
src/main/java/com/sqx/modules/pay/dao/PayDetailsDao.java
View File

@ -7,6 +7,7 @@ import com.sqx.modules.pay.entity.PayDetails;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -21,6 +22,8 @@ public interface PayDetailsDao extends BaseMapper<PayDetails> {
PayDetails selectByRemark(@Param("remark") String remark); PayDetails selectByRemark(@Param("remark") String remark);
PayDetails selectByOrderId(@Param("orderId") String orderId); PayDetails selectByOrderId(@Param("orderId") String orderId);
PayDetails selectOneByLimit(@Param("orderId") String ordersNo);
PayDetails selectByTradeNo(@Param("tradeNo") String tradeNo); PayDetails selectByTradeNo(@Param("tradeNo") String tradeNo);

4
src/main/resources/mapper/pay/PayDetailsDao.xml
View File

@ -15,6 +15,10 @@
select * from pay_details d where d.order_id=#{orderId} select * from pay_details d where d.order_id=#{orderId}
</select> </select>
<select id="selectOneByLimit" resultType="com.sqx.modules.pay.entity.PayDetails">
select * from pay_details d where d.order_id=#{orderId} order by id desc limit 1
</select>
<select id="selectByTradeNo" resultType="com.sqx.modules.pay.entity.PayDetails"> <select id="selectByTradeNo" resultType="com.sqx.modules.pay.entity.PayDetails">
select * from pay_details d where d.trade_no=#{tradeNo} select * from pay_details d where d.trade_no=#{tradeNo}
</select> </select>