Merge remote-tracking branch 'origin/master'
| | |
| | | @ApiModel("订单信息") |
| | | public class ComShopOrderPageVO { |
| | | |
| | | @ApiModelProperty(value = "订单id") |
| | | private Long orderId; |
| | | |
| | | @ApiModelProperty(value = "订单号") |
| | | private String orderNo; |
| | | |
| | |
| | | public interface ComShopOrderDAO extends BaseMapper<ComShopOrderDO> { |
| | | |
| | | @Select("<script> " + |
| | | "select order_no,store_id,`status`,pay_status,receiver_id,total_amount as orderTotal,pay_amount,delivery_type,remark,create_at from com_shop_order as cso" + |
| | | "select id as orderId,order_no,store_id,`status`,pay_status,receiver_id,total_amount as orderTotal,pay_amount,delivery_type,remark,create_at from com_shop_order as cso" + |
| | | " where 1=1 and cso.delete_status = 1 and cso.user_id = #{comOrderListDTO.userId}" + |
| | | "<if test='comOrderListDTO.status != null'>" + |
| | | " AND cso.status = #{comOrderListDTO.status} " + |