打印

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/express/KylinOrderExpressPrintVo.java

+package com.liquidnet.service.kylin.dto.vo.express;
+
+import com.liquidnet.service.kylin.dao.OrderExpressListDao;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 快递信息
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-07-01
+ */
+
+@Data
+@ApiModel
+public class KylinOrderExpressPrintVo implements Serializable {
+
+    private List<OrderExpressListDao> expressList;
+
+    private String jContact;
+    private String jAddress;
+    private String jTel;
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformancesExpressController.java

@@ -9,6 +9,7 @@ import com.liquidnet.service.kylin.dao.OrderExpressListDao;
 import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceListAdminDao;
 import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceOrderListAdminDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceExpressSearchAdminParam;
+import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressPrintVo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -273,8 +274,8 @@ public class PerformancesExpressController extends BaseController {
     @RequiresPermissions("kylin:performancesExpress:batchPrintExpress")
     @PostMapping("/batchPrintExpress")
     @ResponseBody
-    public ResponseDto<List<OrderExpressListDao>> batchPrintExpress(@RequestParam("ids") String performanceId) {
-        List<OrderExpressListDao> res = performancesExpressServiceImpl.batchPrintExpress(performanceId);
+    public ResponseDto<KylinOrderExpressPrintVo> batchPrintExpress(@RequestParam("ids") String performanceId) {
+        KylinOrderExpressPrintVo res = performancesExpressServiceImpl.batchPrintExpress(performanceId);
         try {
             return ResponseDto.success(res);
         } catch (Exception e) {
@@ -288,8 +289,8 @@ public class PerformancesExpressController extends BaseController {
     @RequiresPermissions("kylin:performancesExpress:printExpress")
     @PostMapping("/printExpress")
     @ResponseBody
-    public ResponseDto<List<OrderExpressListDao>> printExpress(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
-        List<OrderExpressListDao> res = performancesExpressServiceImpl.printExpress(performanceExpressSearchAdminParam);
+    public ResponseDto<KylinOrderExpressPrintVo> printExpress(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        KylinOrderExpressPrintVo res = performancesExpressServiceImpl.printExpress(performanceExpressSearchAdminParam);
         try {
             return ResponseDto.success(res);
         } catch (Exception e) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java

@@ -16,6 +16,7 @@ import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.dto.param.*;
 import com.liquidnet.service.kylin.dto.vo.basicServices.UploadVo;
+import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressPrintVo;
 import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressRouteVo;
 import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo;
 import com.liquidnet.service.kylin.entity.*;
@@ -613,15 +614,21 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
         return ossPath;
     }
 
-    public List<OrderExpressListDao> printExpress(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+    public KylinOrderExpressPrintVo printExpress(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
         List<String> ids = performanceExpressSearchAdminParam.getIds();
 
         List<OrderExpressListDao> list = kylinOrderExpressMapper.selectPrintList(ids);
 
-        return list;
+        KylinOrderExpressPrintVo kylinOrderExpressPrintVo = new KylinOrderExpressPrintVo();
+        kylinOrderExpressPrintVo.setExpressList(list);
+        kylinOrderExpressPrintVo.setJContact(jContact);
+        kylinOrderExpressPrintVo.setJAddress(jAddress);
+        kylinOrderExpressPrintVo.setJTel(jTel);
+
+        return kylinOrderExpressPrintVo;
     }
 
-    public List<OrderExpressListDao> batchPrintExpress(String performanceId) {
+    public KylinOrderExpressPrintVo batchPrintExpress(String performanceId) {
         List<KylinOrderTickets> orderList = kylinOrderTicketsMapper.getCanCancelOrderList(performanceId, 0, 9999999);
 
         String ossPath = "";

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderExpressListDao.java

@@ -54,4 +54,20 @@ public class OrderExpressListDao implements Serializable {
     private String newAbflag;
     private String createdAt;
     private String updatedAt;
+
+    private String expressContacts;
+    private String expressAddress;
+    private String expressPhone;
+    private String province;
+    private String city;
+    private String county;
+    private String number;
+
+    private String useStart;
+    private String timeTitle;
+    private String timeType;
+
+    private String ticketsTitle;
+    private String ticketsType;
+
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderExpressMapper.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.liquidnet.service.kylin.dao.OrderExpressListDao;
 import com.liquidnet.service.kylin.entity.KylinOrderExpress;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,5 +17,6 @@ import java.util.List;
  */
 public interface KylinOrderExpressMapper extends BaseMapper<KylinOrderExpress> {
 
-    List<OrderExpressListDao> selectPrintList(List<String> ids);
+    List<OrderExpressListDao> selectPrintList(@Param("ids") List<String> ids);
+
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderExpressMapper.xml

@@ -4,18 +4,18 @@
 
     <select id="selectPrintList" resultType="com.liquidnet.service.kylin.dao.OrderExpressListDao">
         SELECT a.*,
-               b.express_contacts, b.express_address, b.express_phone, b.province, b.city, b.county, b.numger
-               d.use_start, d.title, d.type,
-               e.title, e.type
+               b.express_contacts, b.express_address, b.express_phone, b.province, b.city, b.county, b.number,
+               d.use_start, d.title AS time_title, d.type AS time_type,
+               e.title AS tickets_title, e.type AS tickets_type
         FROM kylin_order_express a
         INNER JOIN kylin_order_tickets b ON a.order_tickets_id = b.order_tickets_id
         INNER JOIN kylin_order_ticket_relations c ON b.order_tickets_id = c.order_id
         INNER JOIN kylin_ticket_times d ON c.time_id = d.ticket_times_id
         INNER JOIN kylin_tickets e ON c.ticket_id = e.tickets_id
         <where>
-            AND a.order_express_id IN
+            a.order_express_id IN
             <foreach collection="ids" item="orderExpressId" index="index" open="(" close=")" separator=",">
-                ${order_express_id}
+                ${orderExpressId}
             </foreach>
         </where>
         ORDER BY mid DESC