update

pay/api/point.json

@@ -0,0 +1,52 @@
+[
+    {
+        "project":"queenshow",
+        "productName":"个人年会员",
+        "productKey":"queenshow_person_year",
+        "price": 1299,
+        "payMethods":[{
+            "key":"wechatPay",
+            "value":1
+        }]
+    },
+    {
+        "project":"queenshow",
+        "productName":"个人月会员",
+        "productKey":"queenshow_person_month",
+        "price": 199,
+        "payMethods":[{
+            "key":"wechatPay",
+            "value":1
+        }]
+    },
+    {
+        "project":"queenshow",
+        "productName":"团队15月年会员",
+        "productKey":"queenshow_team_15month",
+        "price": 1299,
+        "payMethods":[{
+            "key":"wechatPay",
+            "value":1
+        }]
+    },
+    {
+        "project":"queenshow",
+        "productName":"团队年会员",
+        "productKey":"queenshow_team_year",
+        "price": 1299,
+        "payMethods":[{
+            "key":"wechatPay",
+            "value":1
+        }]
+    },
+    {
+        "project":"queenshow",
+        "productName":"团队月会员",
+        "productKey":"queenshow_team_month",
+        "price": 199,
+        "payMethods":[{
+            "key":"wechatPay",
+            "value":1
+        }]
+    }
+]

pay/api/test.go

@@ -1,6 +1,14 @@
 package api
 
 import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net"
+	"net/http"
+	"pay/log"
+	"strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -13,6 +21,64 @@ func PrintParam(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 }
 func GetIp(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 
-	// return utils.IntToDecimal(1)
-	return c.RemoteIP(), nil
+	return getIpInfo(c)
+}
+
+const IPV6_API = "https://api.vore.top/api/IPv6?v6="
+const IPV4_API = "https://api.vore.top/api/IPv4?v4="
+
+type IPVRes struct {
+	Msg    string  `json:"msg"`
+	IpData *IpArea `json:"ipdata"`
+}
+
+type IpArea struct {
+	Province string `json:"info1"`
+	City     string `json:"info2"`
+	District string `json:"info3"`
+	Isp      string `json:"isp"`
+}
+
+type IpInfo struct {
+	Ip string `json:"ip"`
+	IPVRes
+}
+
+func getIpInfo(c *gin.Context) (interface{}, error) {
+
+	_ips := c.Request.Header.Get("X-Forwarded-For")
+	fmt.Println("remoteip-------------:", c.RemoteIP())
+	ips := strings.Split(_ips, ",")
+	fmt.Println("ips-----------:", ips)
+	ipurl := ""
+	ipType := net.ParseIP(ips[0])
+	if ipType.To4() != nil {
+		ipurl = IPV4_API
+	} else {
+		ipurl = IPV6_API
+	}
+
+	getInfoReq := fmt.Sprintf("%s%s", ipurl, ips[0])
+	fmt.Println("requrl-----------:", getInfoReq)
+
+	resp, err := http.Get(getInfoReq)
+	if err != nil {
+		log.Error(err)
+		return nil, errors.New("ipv6获取地域失败")
+	}
+	defer resp.Body.Close()
+
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		log.Error(err)
+		return nil, errors.New("ipv6读取请求数据失败")
+	}
+	var infos IPVRes
+	err = json.Unmarshal(body, &infos)
+	if err != nil {
+		log.Error(err)
+		return nil, errors.New("unmarshal数据失败")
+	}
+
+	return IpInfo{Ip: ips[0], IPVRes: infos}, nil
 }

pay/assettest.log

@@ -45,3 +45,20 @@
 {"level":"info","timestamp":"2023-07-07 14:47:56","message":"[初始化支付客户端]","service_name":"assettest"}
 {"level":"info","timestamp":"2023-07-07 15:30:44","message":"[初始化支付客户端]","service_name":"assettest"}
 {"level":"info","timestamp":"2023-07-10 16:41:37","message":"[初始化支付客户端]","service_name":"assettest"}
+{"level":"info","timestamp":"2023-07-18 10:48:53","message":"[初始化支付客户端]","service_name":"assettest"}
+{"level":"error","timestamp":"2023-07-18 11:01:39","message":"{\"code\":\"ACQ.MERCHANT_STATUS_NOT_NORMAL\",\"msg\":\"Business Failed\",\"sub_code\":\"ACQ.MERCHANT_STATUS_NOT_NORMAL\",\"sub_msg\":\"商户协议状态非正常状态\"}","service_name":"assettest"}
+{"level":"debug","timestamp":"2023-07-18 11:20:23","message":"wxRsp: &wechat.Native{CodeUrl:\"weixin://wxpay/bizpayurl?pr=qqN9f8Kzz\"}","service_name":"assettest"}
+{"level":"info","timestamp":"2023-07-18 11:27:59","message":"[初始化支付客户端]","service_name":"assettest"}
+{"level":"info","timestamp":"2023-07-18 11:30:52","message":"[初始化支付客户端]","service_name":"assettest"}
+{"level":"error","timestamp":"2023-07-18 11:36:19","message":"[amount: 2]","service_name":"assettest"}
+{"level":"debug","timestamp":"2023-07-18 11:36:20","message":"wxRsp: &wechat.Native{CodeUrl:\"weixin://wxpay/bizpayurl?pr=5fEnEK0zz\"}","service_name":"assettest"}
+{"level":"error","timestamp":"2023-07-18 14:15:43","message":"[amount: 2]","service_name":"assettest"}
+{"level":"error","timestamp":"2023-07-18 14:18:56","message":"[amount: 180]","service_name":"assettest"}
+{"level":"info","timestamp":"2023-07-18 14:22:13","message":"[初始化支付客户端]","service_name":"assettest"}
+{"level":"info","timestamp":"2023-07-18 14:31:53","message":"[amount: 36]","service_name":"assettest"}
+{"level":"debug","timestamp":"2023-07-18 14:31:54","message":"wxRsp: &wechat.Native{CodeUrl:\"weixin://wxpay/bizpayurl?pr=EOlEpMEzz\"}","service_name":"assettest"}
+{"level":"error","timestamp":"2023-07-18 14:33:50","message":"{\"code\":\"ACQ.MERCHANT_STATUS_NOT_NORMAL\",\"msg\":\"Business Failed\",\"sub_code\":\"ACQ.MERCHANT_STATUS_NOT_NORMAL\",\"sub_msg\":\"商户协议状态非正常状态\"}","service_name":"assettest"}
+{"level":"info","timestamp":"2023-07-18 15:24:29","message":"[初始化支付客户端]","service_name":"assettest"}
+{"level":"info","timestamp":"2023-07-18 15:37:03","message":"[初始化支付客户端]","service_name":"assettest"}
+{"level":"info","timestamp":"2023-07-18 15:43:06","message":"[初始化支付客户端]","service_name":"assettest"}
+{"level":"info","timestamp":"2023-07-18 16:08:34","message":"[初始化支付客户端]","service_name":"assettest"}

pay/bus/aliPay.go

@@ -26,15 +26,10 @@ func NewSingleAliPay() PayInf {
 func (a *SingleAliPay) Pay(ctx context.Context, orderMsg *cpay.OrderMsg) (interface{}, error) {
 	// 初始化 BodyMap
 	bm := make(gopay.BodyMap)
-	amount, err := strconv.ParseFloat(fmt.Sprintf("%.2f", *orderMsg.Amount), 64)
-	if err != nil {
-		return nil, errors.New("价格parse错误！")
-	}
-	orderId := orderMsg.Project + "_" + orderMsg.Id.Hex()
 	bm.Set("subject", orderMsg.Name).
 		Set("scene", "bar_code").
-		Set("out_trade_no", orderId).
-		Set("total_amount", amount).
+		Set("out_trade_no", fmt.Sprintf("%s_%s", orderMsg.Project, orderMsg.Id.Hex())).
+		Set("total_amount", *orderMsg.Amount).
 		Set("timeout_express", "10m")
 
 	// 下单url

pay/bus/point.go

@@ -86,15 +86,24 @@ func getPointAmount(ctx context.Context, req *pay.PointAmountReq) (amount float6
 	point := pay.Point{}
 	_, err = repo.RepoSeachDoc(&repo.RepoSession{Ctx: ctx, Client: db.GMongoDb}, &repo.DocSearchOptions{
 		CollectName: repo.CollectionPoint,
-		Query:       repo.Map{"_id": req.PointId},
+		Query:       repo.Map{"productKey": req.ProductKey},
 		Project:     []string{"price"},
 	}, &point)
 	if err != nil {
 		return amount, err
 	}
+	var number int32 = 1
+	if *req.Number > 0 {
+		number = *req.Number
+	}
+	var quantity int32 = 1
+	if *req.Quantity > 0 {
+		quantity = *req.Quantity
+	}
+	fmt.Println(number)
 
 	// 计算价格
-	_amount := *point.Price * float64(*req.Quantity)
+	_amount := *point.Price * float64(quantity) * float64(number)
 	amount, err = strconv.ParseFloat(fmt.Sprintf("%.2f", _amount), 64)
 
 	return

pay/bus/wechatPay.go

@@ -32,19 +32,15 @@ func (a *SingleWechatPay) Pay(ctx context.Context, orderMsg *cpay.OrderMsg) (int
 	orderId := orderMsg.Id.Hex()
 	bm := make(gopay.BodyMap)
 	singlePayCnf := utils.GetSinglePayConfig(conf.AppConfig)
-	amount, err := strconv.ParseFloat(fmt.Sprintf("%.2f", *orderMsg.Amount), 64)
-	if err != nil {
-		return nil, errors.New("价格parse错误！")
-	}
 
 	bm.Set("appid", singlePayCnf.WechatPay.AppId).
 		Set("mchid", singlePayCnf.WechatPay.MchId).
 		Set("description", orderMsg.Name).
-		Set("out_trade_no", orderId).
+		Set("out_trade_no", fmt.Sprintf("%s_%s", orderMsg.Project, orderId)).
 		Set("time_expire", time.Now().Add(10*time.Minute).Format(time.RFC3339)).
 		Set("notify_url", singlePayCnf.WechatPay.NotifyUrl).
 		SetBodyMap("amount", func(bm gopay.BodyMap) {
-			bm.Set("total", amount*100).
+			bm.Set("total", *orderMsg.Amount*100).
 				Set("currency", "CNY")
 		})