From a04a5dc5706f75b0e46dd09cd3a2b46d6eb32843 Mon Sep 17 00:00:00 2001
From: "lisai17@sina.com" <lisai17@sina.com>
Date: Wed, 3 Mar 2021 16:46:13 +0800
Subject: [PATCH] .

---
 .../order/ordertemp/OrderTempService.java     | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java
index 858b09a..5f9fb5f 100644
--- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java
+++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java
@@ -2,16 +2,12 @@ package com.cowr.ssjygl.order.ordertemp;
 
 import com.cowr.common.Const;
 import com.cowr.common.base.BaseService;
-import com.cowr.common.enums.OrderStateEnum;
 import com.cowr.common.enums.UserTypeEnum;
 import com.cowr.common.utils.DataUtil;
 import com.cowr.common.utils.DateTimeUtil;
 import com.cowr.common.view.PageParam;
 import com.cowr.common.view.Result;
-import com.cowr.model.InvoiceInvalidVerify;
-import com.cowr.model.OrderInvalidVerify;
-import com.cowr.model.OrderTemp;
-import com.cowr.model.Sysuser;
+import com.cowr.model.*;
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Page;
@@ -206,23 +202,31 @@ public class OrderTempService extends BaseService {
             if (!sqlparams.isEmpty()) {
                 // 一个订单的发票可以作废多次，但是每个订单只能有一个是正在作废中的
                 List<InvoiceInvalidVerify> verifies1 = InvoiceInvalidVerify.dao.find(
-                        "select * from invoice_invalid_verify t where t.order_sn in(" +StrKit.join(sqlparams, ",") + ") and t.state = 1 ", params.toArray());
+                        "select * from invoice_invalid_verify t where t.order_sn in(" + StrKit.join(sqlparams, ",") + ") and t.state = 1 ", params.toArray());
 
                 List<OrderInvalidVerify> verifies2 = OrderInvalidVerify.dao.find(
-                        "select * from order_invalid_verify t where t.order_sn in(" +StrKit.join(sqlparams, ",") + ") and ( t.state = 1 or t.state = 2 )", params.toArray());
+                        "select * from order_invalid_verify t where t.order_sn in(" + StrKit.join(sqlparams, ",") + ") and ( t.state = 1 or t.state = 2 )", params.toArray());
 
+                List<TicketInvalidVerify> verifies3 = TicketInvalidVerify.dao.find(
+                        "select * from ticket_invalid_verify t where t.order_sn in(" + StrKit.join(sqlparams, ",") + ") and t.state = 1 ", params.toArray());
 
                 for (Record record : list) {
                     String rdsn = record.getStr("sn");
 
-                    for(InvoiceInvalidVerify v : verifies1){
-                        if(rdsn.equals(v.getOrderSn())){
+                    for (InvoiceInvalidVerify v : verifies1) {
+                        if (rdsn.equals(v.getOrderSn())) {
                             record.set("invoice_invalid_verify_state", 1);
                         }
                     }
 
-                    for(OrderInvalidVerify v : verifies2){
-                        if(rdsn.equals(v.getOrderSn())){
+                    for (TicketInvalidVerify v : verifies3) {
+                        if (rdsn.equals(v.getOrderSn())) {
+                            record.set("ticket_invalid_verify_state", 1);
+                        }
+                    }
+
+                    for (OrderInvalidVerify v : verifies2) {
+                        if (rdsn.equals(v.getOrderSn())) {
                             record.set("order_invalid_verify_state", 1);
                         }
                     }