wip:临时提交

internal/service/invoiceCallback_red.go

@@ -3,6 +3,7 @@ package service
 import (
 	"ElectronicInvoice/internal/consts"
 	"ElectronicInvoice/util"
+	"context"
 	"fmt"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/encoding/gjson"
@@ -66,11 +67,30 @@ func InvoicingMakeRedCallBackLogic(r *ghttp.Request) error {
 			InvoiceStatus:    "1",
 			BillingTime:      invoiceTime.Unix(),
 		})
-
-		_, err = g.DB().Update(ctx, "invoice", g.Map{
-			"invoice_status": -2,
-			"red":            string(redByte),
-		}, "invoice_changed = 0 AND invoice_number= ? ", num)
+		err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
+			//旧蓝票状态修改已红冲
+			affect, t_err := g.DB().Update(ctx, "invoice", g.Map{
+				"invoice_status": -2,
+				"red":            string(redByte),
+			}, "invoice_changed = 0 AND invoice_number= ? ", num)
+			if t_err != nil {
+				return t_err
+			}
+			if row, _ := affect.RowsAffected(); row != 1 {
+				return gerror.Newf("InvoicingMakeRedCallBackLogic 旧蓝票状态修改已红冲异常 sql(invoice_changed = 0 AND invoice_number= %s)", num)
+			}
+			//新蓝票状态改为可以开票
+			affect, t_err = g.DB().Update(ctx, "invoice", g.Map{
+				"invoice_status": 2,
+			}, "invoice_changed = 1 AND invoice_number= ? ", num)
+			if t_err != nil {
+				return t_err
+			}
+			if row, _ := affect.RowsAffected(); row != 1 {
+				return gerror.Newf("InvoicingMakeRedCallBackLogic 新蓝票状态改为可以开票异常 sql(invoice_changed = 0 AND invoice_number= %s)", num)
+			}
+			return nil
+		})
 		if err != nil {
 			return gerror.Wrap(err, "InvoicingMakeRedCallBackLogic 更新发票状态异常")
 		}

internal/service/invoiceMake.go

@@ -16,7 +16,7 @@ func (im *InvoiceManager) simpleMakeInvoice(ctx context.Context) (total, okNum i
 	var (
 		res gdb.Result
 	)
-	//查询需要开票的数据
+	//查询需要开票的数据()
 	res, err = g.DB().Query(ctx, "SELECT a.*,b.pay_way,b.order_money,b.pay_money FROM invoice a INNER JOIN dataexport_order b ON a.order_code=b.order_code WHERE a.invoice_status=0 AND a.invoice_changed=0 AND  a.invoice_variety='普通发票（电子发票）' AND a.invoice_order_code is NULL AND a.create_time > ? ", consts.InvoiceStartTime.Unix())
 	if err != nil {
 		err = gerror.Wrap(err, "simpleMakeInvoice-查询待开票异常")