Browse Source

fix:修改

duxin 2 months ago
parent
commit
9d06dc63cd

+ 1 - 0
internal/cmd/cmd.go

@@ -70,6 +70,7 @@ var (
 					orderGroup.POST("/findUserAccount", controller.FindUserAccount)            //代用户下单创建账号
 					orderGroup.POST("/transferAccounts", controller.TransferAccounts)          //对公转行审核
 					orderGroup.POST("/serviceOpen", controller.OrderServiceOpen)               //开通权益
+					orderGroup.POST("/InvoiceQuery", controller.InvoiceQuery)                  //开通权益
 
 					orderGroup.POST("/createQRCode", controller.CreateQRCode)       //二维码
 					orderGroup.POST("/openInvoiceInfo", controller.OpenInvoiceInfo) //开发票

+ 1 - 1
internal/controller/orderFindUserAccount.go

@@ -18,7 +18,7 @@ func FindUserAccount(r *ghttp.Request) {
 		if err != nil {
 			return nil, errors.Wrap(err, "数据校验异常")
 		}
-		data, err := order.OrderFindUserAccount(r.Context(), param)
+		data, err := order.OrFindUserAccount(r.Context(), param)
 		if err != nil {
 			return nil, errors.Wrap(err, "代用户下单创建账号异常")
 		}

+ 31 - 0
internal/controller/orderInvoiceQuery.go

@@ -0,0 +1,31 @@
+package controller
+
+import (
+	. "app.yhyue.com/moapp/jybase/api"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/net/ghttp"
+	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/pkg/errors"
+	"jyOrderManager/internal/logic/order"
+	"jyOrderManager/internal/model"
+)
+
+// InvoiceQuery 发票查询
+func InvoiceQuery(r *ghttp.Request) {
+	rData, err := func() (interface{}, error) {
+		var param model.OrderDetailParams
+		err := gconv.Struct(r.GetBody(), &param)
+		if err != nil {
+			return nil, errors.Wrap(err, "数据校验异常")
+		}
+		data, err := order.InvoiceOrderQuery(r.Context(), param)
+		if err != nil {
+			return nil, errors.Wrap(err, "代用户下单创建账号异常")
+		}
+		return data, nil
+	}()
+	if err != nil {
+		g.Log().Errorf(r.Context(), "代用户下单创建账号异常 %v", err)
+	}
+	r.Response.WriteJson(NewResult(rData, err))
+}

+ 2 - 2
internal/logic/order/findUserAccount.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 )
 
-// OrderFindUserAccount 代用户下单
-func OrderFindUserAccount(ctx context.Context, param model.OrderHelpVipInfoParams) (interface{}, error) {
+// OrFindUserAccount 代用户下单
+func OrFindUserAccount(ctx context.Context, param model.OrderHelpVipInfoParams) (interface{}, error) {
 	userData, ok := jyutil.MG.DB().Find("user", map[string]interface{}{
 		"i_appid": 2,
 		"$or": []map[string]interface{}{

+ 49 - 0
internal/logic/order/invoiceQuery.go

@@ -0,0 +1,49 @@
+package order
+
+import (
+	"app.yhyue.com/moapp/jybase/common"
+	"context"
+	"errors"
+	"fmt"
+	"github.com/gogf/gf/v2/frame/g"
+	"jyOrderManager/internal/model"
+	"strings"
+)
+
+func InvoiceOrderQuery(ctx context.Context, param model.OrderDetailParams) (interface{}, error) {
+	orderCodeArr := strings.Split(param.OrderCode, ",")
+	if len(orderCodeArr) == 0 {
+		return map[string]interface{}{}, errors.New("订单编号为空")
+	}
+	//根据订单编号查询订单信息
+	querySQL := fmt.Sprintf("select  order_code ,invoice_variety  from   invoice  where   order_code  in  (%s) and   invoice_status=0", fmt.Sprintf("\"%s\"", strings.Join(orderCodeArr, "\",\"")))
+	invoiceArr, _ := g.DB().Query(ctx, querySQL)
+	invoiceVariety := ""
+	if invoiceArr.Len() != len(orderCodeArr) {
+		return map[string]interface{}{}, errors.New("订单编号有误")
+	}
+	for _, v1 := range orderCodeArr {
+		fool := true
+		for _, v2 := range invoiceArr.List() {
+			//判断一下所有订单都有发票信息
+			orderCode := v2["order_code"]
+			if v1 == orderCode {
+				fool = false
+				//查看发票类型是否是同一个
+				if invoiceVariety == "" {
+					invoiceVariety = common.InterfaceToStr(v2["invoice_variety"])
+				} else {
+					if invoiceVariety != common.InterfaceToStr(v2["invoice_variety"]) {
+						fool = true
+					}
+				}
+			}
+		}
+		if fool {
+			return map[string]interface{}{}, errors.New("订单编号有误")
+		}
+	}
+	return map[string]interface{}{
+		"invoice_variety": invoiceVariety,
+	}, nil
+}