Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
commit
48f605ecb1
|
|
@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil;
|
|||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.sqx.common.utils.DateUtils;
|
||||
import com.sqx.modules.app.entity.InviteAchievement;
|
||||
import com.sqx.modules.app.entity.UserEntity;
|
||||
|
|
@ -98,7 +99,7 @@ public class TempOrdersTask {
|
|||
for (Orders order : orders) {
|
||||
ThreadUtil.sleep(100);
|
||||
|
||||
PayDetails payDetails = payDetailsDao.selectByOrderId(order.getOrdersNo());
|
||||
PayDetails payDetails = payDetailsDao.selectOneByLimit(order.getOrdersNo());
|
||||
if (payDetails == null) {
|
||||
order.setStatus(3);
|
||||
ordersDao.updateById(order);
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import com.sqx.modules.pay.entity.PayDetails;
|
|||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
|
|
@ -21,6 +22,8 @@ public interface PayDetailsDao extends BaseMapper<PayDetails> {
|
|||
PayDetails selectByRemark(@Param("remark") String remark);
|
||||
|
||||
PayDetails selectByOrderId(@Param("orderId") String orderId);
|
||||
PayDetails selectOneByLimit(@Param("orderId") String ordersNo);
|
||||
|
||||
|
||||
PayDetails selectByTradeNo(@Param("tradeNo") String tradeNo);
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,10 @@
|
|||
select * from pay_details d where d.order_id=#{orderId}
|
||||
</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 * from pay_details d where d.trade_no=#{tradeNo}
|
||||
</select>
|
||||
|
|
|
|||
Loading…
Reference in New Issue