Merge branch 'develop' of k.zhang/duoduo into test

apis/user/base.go

@@ -11,6 +11,6 @@ func InitUserRouter(engine *gin.RouterGroup) {
 		v1.POST("/user/order/list", OrderGet)    //获取订单列表
 		v1.POST("/user/open.id/get", OpenIdGet)  //根据openId获取信息
 		v1.POST("/user/update/name", UpdateName) //更新名字
-		v1.POST("/user/list", UserList)          //更新名字
+		v1.POST("/user/list", UserList)          //用户列表
 	}
 }

apis/user/user.order.get.go

@@ -4,11 +4,13 @@ import (
 	"duoduo/models/mysql"
 	"duoduo/models/user"
 	"duoduo/tools/app"
+	"fmt"
 	"github.com/gin-gonic/gin"
 )
 
 func OrderGet(c *gin.Context) {
 	var inData user.OrderGetRequest
+	var outData user.OrderGetResponse
 	var orderOpneId mysql.Order
 
 	var pageSize = 10
@@ -34,5 +36,25 @@ func OrderGet(c *gin.Context) {
 		return
 	}
 
-	app.PageOK(c, orderVal, count, pageIndex, pageSize, app.Success)
+	fmt.Print(orderVal)
+
+	for i := 0; i < len(orderVal); i++ {
+		var orderInfo user.OrderInfo
+		orderInfo.Order = orderVal[i]
+		if inData.UserStatus == 0 {
+			orderInfo.Amount = orderVal[i].Amount
+		} else if inData.UserStatus == 1 {
+			orderInfo.Amount = orderVal[i].Amount1
+		} else if inData.UserStatus == 2 {
+			orderInfo.Amount = orderVal[i].Amount2
+		} else {
+			app.Error(c, 500, err, "UserStatus error")
+			return
+		}
+
+		outData.OrderInfo = append(outData.OrderInfo, orderInfo)
+
+	}
+
+	app.PageOK(c, outData, count, pageIndex, pageSize, app.Success)
 }

models/mysql/order.go

@@ -266,7 +266,9 @@ func (o *Order) GetOrderOpenIdList(pageSize int, pageIndex int, status int) ([]O
 	//table = table.Where("open_id = ?  ", o.OpenId)
 
 	var count int
-	if err := table.Select("order_id,promotion_amount,p_id,order_status,order_status_desc,goods_name,goods_thumbnail_url,order_group_success_time,amount,amount_1,amount_2,order_sn,DATE_FORMAT(order_create_time,'%Y-%m-%d %H:%i:%s') as order_create_time,order_amount").Order("id desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
+	if err := table.Select("order_id,promotion_amount,p_id,order_status,order_status_desc,goods_name," +
+		"goods_thumbnail_url,order_group_success_time,amount,amount_1,amount_2,order_sn," +
+		"DATE_FORMAT(order_create_time,'%Y-%m-%d %H:%i:%s') as order_create_time,order_amount").Order("id desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
 		return nil, 0, err
 	}
 	table.Count(&count)

models/mysql/user.go

@@ -44,9 +44,9 @@ func (u *User) GetNum() int {
 
 }
 
-func (u *User) Get() (User, error) {
-	var doc User
-	err := orm.Eloquent.Select("pid,nick_name,avatar_url,open_id_1,open_id_2").Where("open_id = ? ", u.OpenID).Table(u.TableName()).First(&doc).Error
+func (u *User) Get() (UserName, error) {
+	var doc UserName
+	err := orm.Eloquent.Select("id,pid,nick_name,avatar_url,open_id_1,open_id_2").Where("open_id = ? ", u.OpenID).Table(u.TableName()).First(&doc).Error
 	if err != nil {
 		return doc, err
 	}
@@ -91,8 +91,8 @@ func (u *User) UpdateName() (update User, err error) {
 }
 
 //list 接口使用
-func (u *User) GetOrderOpenIdList(pageSize int, pageIndex int, status int) ([]User, int, error) {
-	var doc []User
+func (u *User) GetOrderOpenIdList(pageSize int, pageIndex int, status int) ([]UserName, int, error) {
+	var doc []UserName
 
 	table := orm.Eloquent.Table(u.TableName())
 

models/user/user.open.id.get.go

@@ -7,5 +7,5 @@ type OpenIdGetRequest struct {
 }
 
 type OpenIdGetResponse struct {
-	User mysql.User `json:"user"`
+	User mysql.UserName `json:"user"`
 }

models/user/user.order.get.go

@@ -1,6 +1,9 @@
 package user
 
-import "duoduo/models/mysql"
+import (
+	"duoduo/models/mysql"
+	"github.com/shopspring/decimal"
+)
 
 type OrderGetRequest struct {
 	OpenId     string `json:"openId"`
@@ -10,5 +13,10 @@ type OrderGetRequest struct {
 }
 
 type OrderGetResponse struct {
-	Order []mysql.Order `json:"order"`
+	OrderInfo []OrderInfo `json:"orderInfo"`
+}
+
+type OrderInfo struct {
+	Order  mysql.Order     `json:"order"`
+	Amount decimal.Decimal `json:"amount"`
 }