diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index 458a4dbc8..63123dbee 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -45,9 +45,9 @@ public class OrderBasicInfoController extends BaseController { */ @PreAuthorize("@ss.hasPermi('order:order:list')") @GetMapping("/order/list") - public TableDataInfo list(QueryOrderDTO orderBasicInfo) { + public TableDataInfo list(QueryOrderDTO dto) { startPage(); - List list = orderBasicInfoService.selectOrderBasicInfoList(orderBasicInfo); + List list = orderBasicInfoService.selectOrderBasicInfoList(dto); return getDataTable(list); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java index 7d915ef33..1a296acbf 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java @@ -36,6 +36,9 @@ public class QueryOrderDTO extends BaseEntity { */ private String orderCode; + // 交易流水号 + private String transactionCode; + /** * 手机号 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java index d9789d013..76fd487a5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java @@ -25,6 +25,11 @@ public class OrderListVO { @Excel(name = "订单号") private String orderCode; + /** + * 交易流水号 + */ + private String transactionCode; + /** * 订单状态 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 38c8e6eb4..df8eca15d 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -146,6 +146,7 @@ SELECT t1.id as id, t1.order_code as orderCode, + t1.transaction_code as transactionCode, t1.order_status as orderStatus, t1.member_id as memberId, t2.nick_name as nickName, @@ -185,6 +186,9 @@ and t1.order_code = #{orderCode,jdbcType=VARCHAR} + + and t1.transaction_code = #{transactionCode,jdbcType=VARCHAR} + and t2.mobile_number = #{mobileNumber,jdbcType=VARCHAR} diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue index a134bf4e3..27b460bbb 100644 --- a/jsowell-ui/src/views/order/order/index.vue +++ b/jsowell-ui/src/views/order/order/index.vue @@ -26,6 +26,15 @@ /> + + + + - + --> + @@ -289,6 +299,7 @@ export default { pageNum: 1, pageSize: 10, orderCode: null, + transactionCode: null, mobileNumber: null, orderStatus: null, stationId: null,