下单储存演出id 增加打印记录字段

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

@@ -153,10 +153,13 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
                 continue;
             }
             KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
-                    new QueryWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)
+                    Wrappers.lambdaQuery(KylinOrderTickets.class).eq(KylinOrderTickets::getOrderTicketsId, orderTicketsId)
             );
             KylinOrderTicketStatus orderStatus = kylinOrderTicketStatusMapper.selectOne(
-                    new QueryWrapper<KylinOrderTicketStatus>().eq("order_id", orderTicketsId)
+                    Wrappers.lambdaQuery(KylinOrderTicketStatus.class).eq(KylinOrderTicketStatus::getOrderId, orderTicketsId)
+            );
+            KylinOrderTicketRelations Relations = kylinOrderTicketRelationsMapper.selectOne(
+                    Wrappers.lambdaQuery(KylinOrderTicketRelations.class).eq(KylinOrderTicketRelations::getOrderId, orderTicketsId)
             );
             if (orderStatus.getStatus() != KylinTableStatusConst.ORDER_STATUS1 && orderStatus.getStatus() != KylinTableStatusConst.ORDER_STATUS6) {
                 return ResponseDto.failure("当前状态不能下单");
@@ -177,6 +180,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
             kylinOrderExpressPre.setOrderExpressCode(OrderExpressCode);
             kylinOrderExpressPre.setExpressType(expressType);
             kylinOrderExpressPre.setCreatedAt(DateUtil.getNowTime());
+            kylinOrderExpressPre.setPerformancesId(Relations.getPerformanceId());
             kylinOrderExpressMapper.insert(kylinOrderExpressPre);
 
             // 请求下单数据
@@ -629,15 +633,33 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
     }
 
     public KylinOrderExpressPrintVo batchPrintExpress(String performanceId) {
-        List<KylinOrderTickets> orderList = kylinOrderTicketsMapper.getCanCancelOrderList(performanceId, 0, 9999999);
+        int count = 0;
+        int limitNum = 20;
+        int mid = 0;
+        do {
+            /*List<KylinOrderRefunds> list = kylinOrderExpressMapper.selectPrintList(whereType, refundBatchId, whereStatus, mid, limitNum);
+
+            List<String> ids = performanceExpressSearchAdminParam.getIds();
+
+            List<OrderExpressListDao> list = kylinOrderExpressMapper.selectPrintList(ids);
+
+            KylinOrderExpressPrintVo kylinOrderExpressPrintVo = new KylinOrderExpressPrintVo();
+            kylinOrderExpressPrintVo.setExpressList(list);
+            kylinOrderExpressPrintVo.setJContact(jContact);
+            kylinOrderExpressPrintVo.setJAddress(jAddress);
+            kylinOrderExpressPrintVo.setJTel(jTel);
+
+            return kylinOrderExpressPrintVo;
+
+            count = refundList.size();
+            if (count > 0) {
+                KylinOrderRefunds lastInfo = refundList.get(count - 1);
+                if (lastInfo != null) {
+                    mid = lastInfo.getMid();
+                }
+            }*/
+        } while (count >= limitNum);
 
-        String ossPath = "";
-        if (!CollectionUtil.isEmpty(orderList)) {
-            List<String> orderIds = orderList.stream().map(KylinOrderTickets -> KylinOrderTickets.getOrderTicketsId()).collect(Collectors.toList());
-            PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam = new PerformanceExpressSearchAdminParam();
-            performanceExpressSearchAdminParam.setIds(orderIds);
-            ossPath = generateImage(performanceExpressSearchAdminParam);
-        }
         return null;
     }
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderExpress.java

@@ -27,6 +27,7 @@ public class KylinOrderExpress implements Serializable {
 
     private String orderExpressId;
     private String orderTicketsId;
+    private String performancesId;
     private String orderExpressCode;
     private String mailno;
     private Integer expressType;
@@ -71,6 +72,9 @@ public class KylinOrderExpress implements Serializable {
     private String newIcon;
     private String newAbflag;
 
+    private Integer isPrint;
+    private Integer printNum;
+
     /**
      * 创建时间
      */

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -802,6 +802,7 @@ CREATE TABLE `kylin_order_express`
 (
     `mid`                    int unsigned   NOT NULL AUTO_INCREMENT,
     `order_express_id`       varchar(255)   NOT NULL DEFAULT '' COMMENT 'order_express_id',
+    `performances_id`        varchar(255)   NOT NULL DEFAULT '' COMMENT 'performances_id',
     `order_tickets_id`       varchar(255)   NOT NULL DEFAULT '' COMMENT '订单id',
     `order_express_code`     varchar(255)   NOT NULL DEFAULT '' COMMENT '订单快递编号',
     `mailno`                 varchar(255)   NOT NULL DEFAULT '' COMMENT '顺丰运单号',
@@ -848,6 +849,9 @@ CREATE TABLE `kylin_order_express`
     `new_icon`               varchar(100)   NOT NULL DEFAULT '' COMMENT 'ab标扩展',
     `new_abflag`             varchar(30)    NOT NULL DEFAULT '' COMMENT '打印图标扩展',
 
+    `is_print`               tinyint        NOT NULL DEFAULT 1 COMMENT '是否打印 1无 2已打印',
+    `print_num`              int            NOT NULL DEFAULT 0 COMMENT '打印次数',
+
     `created_at`             timestamp      NULL     DEFAULT NULL,
     `updated_at`             timestamp      NULL     DEFAULT NULL,
     KEY `order_express_id_index` (`order_express_id`),