update 导出订单 新增车牌号和vin

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java

@@ -103,7 +103,7 @@ public class OrderBasicInfoController extends BaseController {
 	}
 
 	/**
-	 * 导出订单列表
+	 * 导出订单列表/订单导出
 	 */
 	@PreAuthorize("@ss.hasPermi('order:order:export')")
 	@Log(title = "订单", businessType = BusinessType.EXPORT)

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java

@@ -99,6 +99,12 @@ public class OrderListVO {
     @Excel(name = "逻辑卡号")
     private String logicCard;
 
+    /**
+     * 车牌号
+     */
+    @Excel(name = "车牌号")
+    private String plateNumber;
+
     /**
      * vin码
      */

jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml

@@ -174,6 +174,7 @@
                t1.connector_code           as connectorCode,
                t1.logic_card               as logicCard,
                t1.vin_code                 as vinCode,
+                t1.plate_number as plateNumber,
                t1.start_mode               as startMode,
                t1.pay_mode                 as payMode,
                t1.pay_status               as payStatus,
@@ -195,7 +196,7 @@
         from order_basic_info t1
          left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0'
          join pile_station_info t3 on t1.station_id = t3.id and t3.del_flag = '0'
-         join order_detail t4 on t4.order_code = t1.order_code and t4.del_flag = '0' and t4.del_flag = '0'
+         join order_detail t4 on t4.order_code = t1.order_code and t4.del_flag = '0'
          left join member_transaction_record t5 on t5.order_code = t1.order_code and action_type = 'forward' and t5.del_flag = '0'
         where t1.del_flag = '0'
         <if test="pileSn != null and pileSn != ''">