我得免单订单状态
This commit is contained in:
parent
77d9a9ef25
commit
d09299d584
|
|
@ -25,6 +25,7 @@ import javax.annotation.Resource;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
@ -396,6 +397,9 @@ public class OrderService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
PageInfo pageInfo = new PageInfo(list);
|
PageInfo pageInfo = new PageInfo(list);
|
||||||
|
if (page > pageInfo.getPages()) {
|
||||||
|
pageInfo.setList(Collections.emptyList());
|
||||||
|
}
|
||||||
return Result.success(CodeEnum.SUCCESS, pageInfo);
|
return Result.success(CodeEnum.SUCCESS, pageInfo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -563,6 +563,6 @@
|
||||||
<select id="selectWinnerByUserId" resultType="com.chaozhanggui.system.cashierservice.entity.TbOrderInfo">
|
<select id="selectWinnerByUserId" resultType="com.chaozhanggui.system.cashierservice.entity.TbOrderInfo">
|
||||||
select toi.*,two.order_no as winnnerNo,tui.nick_name as userName from tb_order_info toi left join tb_wining_user two on two.order_no = toi.order_no
|
select toi.*,two.order_no as winnnerNo,tui.nick_name as userName from tb_order_info toi left join tb_wining_user two on two.order_no = toi.order_no
|
||||||
left join tb_user_info tui on tui.id = toi.user_id
|
left join tb_user_info tui on tui.id = toi.user_id
|
||||||
where toi.user_id = #{userId} and
|
where toi.user_id = #{userId}
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
Loading…
Reference in New Issue