update 后管订单页面改造

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<OrderListVO> list = orderBasicInfoService.selectOrderBasicInfoList(orderBasicInfo);
+		List<OrderListVO> list = orderBasicInfoService.selectOrderBasicInfoList(dto);
 		return getDataTable(list);
 	}
 

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;
+
 	/**
 	 * 手机号
 	 */

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;
+
     /**
      * 订单状态
      */

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 @@
         <if test="orderCode != null and orderCode != ''">
             and t1.order_code = #{orderCode,jdbcType=VARCHAR}
         </if>
+        <if test="transactionCode != null and transactionCode != ''">
+            and t1.transaction_code = #{transactionCode,jdbcType=VARCHAR}
+        </if>
         <if test="mobileNumber != null and mobileNumber != ''">
             and t2.mobile_number = #{mobileNumber,jdbcType=VARCHAR}
         </if>

jsowell-ui/src/views/order/order/index.vue

@@ -26,6 +26,15 @@
         />
       </el-form-item>
 
+      <el-form-item label="交易流水号" prop="transactionCode">
+        <el-input
+          v-model="queryParams.transactionCode"
+          placeholder="请输入交易流水号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
       <el-form-item label="订单状态" prop="orderStatus">
         <el-select
           v-model="queryParams.orderStatus"
@@ -127,7 +136,7 @@
 
     <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="订单编号" align="center" prop="orderCode" width="280px">
+      <el-table-column label="订单编号" align="center" prop="orderCode" width="180px">
         <template slot-scope="scope">
           <router-link
             :to="'/order/index/orderDetail/'+scope.row.orderCode"
@@ -145,6 +154,7 @@
           />
         </template>
       </el-table-column>-->
+      <el-table-column label="交易流水号" align="center" prop="transactionCode" width="280px"/>
       <el-table-column label="订单状态描述" align="center" prop="orderStatusDescribe"/>
       <el-table-column label="会员昵称" align="center" prop="nickName" width="120px"/>
       <el-table-column label="电话号码" align="center" prop="mobileNumber" width="120px"/>
@@ -289,6 +299,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         orderCode: null,
+        transactionCode: null,
         mobileNumber: null,
         orderStatus: null,
         stationId: null,