k.zhang 4 年 前
コミット
be5cc7a9d9

+ 0 - 1
apis/pdd/base.go

@@ -18,7 +18,6 @@ func InitSetRouter(engine *gin.RouterGroup) {
 	v1 := engine.Group("v1")
 	{
 		v1.POST("/set", Set) //
-
 	}
 }
 

+ 1 - 0
apis/user/base.go

@@ -7,5 +7,6 @@ func InitUserRouter(engine *gin.RouterGroup) {
 	{
 		v1.POST("/user/open.id/set", OpenIdSet) //设置openId
 		v1.POST("/user/pid/get", PidGet)        //获取pid
+		v1.POST("/user/wallet/get", WalletGet)  //用户钱包信息
 	}
 }

+ 1 - 0
apis/user/user.order.get.go

@@ -0,0 +1 @@
+package user

+ 11 - 3
apis/user/user.pid.get.go

@@ -93,9 +93,17 @@ func PidGet(c *gin.Context) {
 		pid.CreateTime = tools.GetCurrntTimeStr()
 		pid.Create()
 
-		//wallet.OpenID = inData.OpenId
-		//wallet.Pid = outData.Pid
-		//wallet.Update()
+		//生成pid 成功 创建钱包
+		var wallet mysql.Wallet
+		wallet.Pid = pidOut.PIDGenerateResponse.PIDList[0].PID
+		wallet.OpenID = inData.OpenId
+		wallet.CreateTime = tools.GetCurrntTimeStr()
+		wallet.UpdateTime = tools.GetCurrntTimeStr()
+		_, err = wallet.Create()
+		if err != nil {
+			app.Error(c, 500, err, "创建钱包失败")
+			return
+		}
 
 	} else {
 		outData.Pid = val.Pid

+ 38 - 0
apis/user/user.wallet.get.go

@@ -0,0 +1,38 @@
+package user
+
+import (
+	"duoduo/models/mysql"
+	"duoduo/models/user"
+	"duoduo/tools/app"
+	"fmt"
+	"github.com/gin-gonic/gin"
+)
+
+// 查询钱包
+func WalletGet(c *gin.Context) {
+	var inData user.WalletGetRequest
+	var outData user.WalletGetResponse
+	var wallet mysql.Wallet
+
+	err := c.ShouldBindJSON(&inData)
+	if err != nil {
+		app.Error(c, 400, err, err.Error())
+		return
+	}
+
+	wallet.OpenID = inData.OpenId
+	fmt.Print(wallet.OpenID)
+	walletVal, err := wallet.Get()
+	if err != nil {
+		app.Error(c, 500, err, err.Error())
+		return
+	}
+
+	//for i := 0; i < len(walletVal); i++ {
+	//
+	//}
+	outData.Wallet = walletVal
+
+	app.OK(c, outData, app.Success)
+
+}

+ 14 - 0
models/mysql/wallet.go

@@ -63,3 +63,17 @@ func (w *Wallet) UpdateAll() (update Wallet, err error) {
 
 	return update, nil
 }
+
+func (w *Wallet) Get() (Wallet, error) {
+	var doc Wallet
+
+	err := orm.Eloquent.Select("SUM(total_amount) as total_amount, SUM(available_amount) as available_amount,"+
+		"SUM(today_amount) as today_amount  , SUM(yesterday_amount) as yesterday_amount, "+
+		"SUM(lately_amount) as lately_amount,SUM(withdrawal_amount) as withdrawal_amount").Where("open_id = ? ", w.OpenID).Table(w.TableName()).Order("id desc").Find(&doc).Error
+
+	if err != nil {
+		return doc, err
+	}
+	return doc, nil
+
+}

+ 11 - 0
models/user/user.wallet.get.go

@@ -0,0 +1,11 @@
+package user
+
+import "duoduo/models/mysql"
+
+type WalletGetRequest struct {
+	OpenId string `json:"openId"`
+}
+
+type WalletGetResponse struct {
+	Wallet mysql.Wallet `json:"wallet"`
+}

+ 3 - 0
report/pdd.ddk.order.list.increment.get.go

@@ -11,6 +11,9 @@ import (
 	"time"
 )
 
+//1 分钟计算一次?
+//2 分钟计算一次
+//创建订单的时候就把他算好  根据状态进行累计加减  每天统计一次,
 func OrderList() {
 
 	go DdkOrder()