fix:开通权益增加校验手机号格式

internal/logic/order/editBatchReturn.go

@@ -10,6 +10,7 @@ import (
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
+	"jyOrderManager/internal/consts"
 	"jyOrderManager/internal/jyutil"
 	"jyOrderManager/internal/logic/product"
 	"jyOrderManager/internal/model"
@@ -173,7 +174,10 @@ func EditBatchReturn(ctx context.Context, param model.OrdersEditBatchReturn) err
 			}
 
 			//修改成功，判断是否全额回款并且创建订单勾选回款开通权益
-			if gconv.Int(value["return_status"]) != 1 && gconv.Int(updateData["return_status"]) == 1 {
+			if gconv.Int(value["return_status"]) != 1 && gconv.Int(value["user_phone"]) != 1 && gconv.Int(updateData["return_status"]) == 1 {
+				if !consts.PhoneRegex.MatchString(gconv.String(value["user_phone"])) {
+					return errors.New("手机号格式异常")
+				}
 				productDetail, err := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s' and returned_open =1`, orderCode))
 				if err != nil || productDetail.IsEmpty() {
 					return err

internal/logic/order/examine.go

@@ -11,13 +11,13 @@ import (
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
+	"jyOrderManager/internal/consts"
 	"jyOrderManager/internal/jyutil"
 	"jyOrderManager/internal/logic/product"
 	"jyOrderManager/internal/model"
 	"jyOrderManager/internal/service"
 	"log"
 	"math"
-	"regexp"
 	"strings"
 	"time"
 )
@@ -138,9 +138,8 @@ func OrdersExamine(ctx context.Context, param model.OrdersExamine) error {
 				}
 			}
 			//0元订单审核通过后直接开通权益
-			regRuler := "^1[03456789]{1}\\d{9}$"
-			reg := regexp.MustCompile(regRuler)
-			if common.Float64All((orderData.Map())["pay_money"]) == 0 && reg.MatchString(common.ObjToString((orderData.Map())["user_phone"])) {
+
+			if common.Float64All((orderData.Map())["pay_money"]) == 0 && consts.PhoneRegex.MatchString(common.ObjToString((orderData.Map())["user_phone"])) {
 				upData["order_status"] = 1
 				if err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
 					// 产品服务开通

internal/logic/order/redPunch.go

@@ -10,6 +10,7 @@ import (
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
+	"jyOrderManager/internal/consts"
 	"jyOrderManager/internal/jyutil"
 	"jyOrderManager/internal/logic/product"
 	"jyOrderManager/internal/model"
@@ -142,6 +143,9 @@ func OperateOrderRedPunch(ctx context.Context, params model.OrderRedPunchParams)
 		if return_money >= params.PayMoney {
 			updateData["return_status"] = 1
 			//全额回款开通权益
+			if !consts.PhoneRegex.MatchString(gconv.String(orderData["user_phone"])) {
+				return errors.New("手机号格式异常")
+			}
 			productDetail, _ := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s' and returned_open =1`, params.OrderCode))
 			if !productDetail.IsEmpty() {
 				if err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {

internal/logic/order/serviceOpen.go

@@ -8,6 +8,7 @@ import (
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
+	"jyOrderManager/internal/consts"
 	"jyOrderManager/internal/jyutil"
 	"jyOrderManager/internal/logic/product"
 	"jyOrderManager/internal/model"
@@ -17,11 +18,13 @@ import (
 
 func ServiceOpen(ctx context.Context, param model.OrderOpenServiceParams) error {
 	//查询订单
+	if !consts.PhoneRegex.MatchString(param.Phone) {
+		return errors.New("手机号格式异常")
+	}
 	orderData, _ := g.DB().GetOne(ctx, fmt.Sprintf("select   * from  dataexport_order  where  order_code ='%s' and audit_status =3", param.OrderCode))
 	if orderData.IsEmpty() {
 		return errors.New("为查询到订单信息")
 	}
-
 	if gconv.String(orderData.Map()["user_phone"]) != param.Phone {
 		g.DB().Update(ctx, "dataexport_order", map[string]interface{}{
 			"user_phone": param.Phone,

internal/logic/timedTask/automaticPayment.go

@@ -9,6 +9,7 @@ import (
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
+	"jyOrderManager/internal/consts"
 	"jyOrderManager/internal/jyutil"
 	"jyOrderManager/internal/logic/order"
 	"jyOrderManager/internal/logic/product"
@@ -141,6 +142,10 @@ WHERE
 								g.DB().Update(ctx, "transaction", map[string]interface{}{"ISRELATION": 1, "return_id": fmt.Sprint(returnId)}, map[string]interface{}{"id": id})
 								log.Println("自动回款开通权益", orderCode, gconv.Int(o["return_status"]), updateData["return_status"], returned_money, returnMoney, money)
 								if gconv.Int(o["return_status"]) != 1 && updateData["return_status"] == 1 {
+									//全额回款开通权益
+									if !consts.PhoneRegex.MatchString(gconv.String(o["user_phone"])) {
+										continue
+									}
 									productDetail, err := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s' and returned_open =1`, orderCode))
 									if err != nil || productDetail.IsEmpty() {
 										continue