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

models/mysql/order.go

@@ -1,19 +1,27 @@
 package mysql
 
-import orm "duoduo/database"
+import (
+	orm "duoduo/database"
+	"github.com/shopspring/decimal"
+)
 
 type Order struct {
-	CreateTime            string `gorm:"column:create_time" json:"createTime"`
-	GoodsName             string `gorm:"column:goods_name" json:"goodsName"`
-	GoodsThumbnailURL     string `gorm:"column:goods_thumbnail_url" json:"goodsThumbnailUrl"`
-	JSONData              string `gorm:"column:json_data" json:"jsonData"`
-	OrderGroupSuccessTime string `gorm:"column:order_group_success_time" json:"orderGroupSuccessTime"`
-	OrderID               string `gorm:"column:order_id" json:"orderId"`
-	OrderStatus           int    `gorm:"column:order_status" json:"orderStatus"`
-	OrderStatusDesc       string `gorm:"column:order_status_desc" json:"orderStatusDesc"`
-	PID                   string `gorm:"column:p_id" json:"pId"`
-	PromotionAmount       int    `gorm:"column:promotion_amount" json:"promotionAmount"`
-	UpdateTime            string `gorm:"column:update_time" json:"updateTime"`
+	CreateTime            string          `gorm:"column:create_time" json:"createTime"`
+	GoodsName             string          `gorm:"column:goods_name" json:"goodsName"`
+	GoodsThumbnailURL     string          `gorm:"column:goods_thumbnail_url" json:"goodsThumbnailUrl"`
+	JSONData              string          `gorm:"column:json_data" json:"jsonData"`
+	OrderGroupSuccessTime string          `gorm:"column:order_group_success_time" json:"orderGroupSuccessTime"`
+	OrderID               string          `gorm:"column:order_id" json:"orderId"`
+	OrderStatus           int             `gorm:"column:order_status" json:"orderStatus"`
+	OrderStatusDesc       string          `gorm:"column:order_status_desc" json:"orderStatusDesc"`
+	PID                   string          `gorm:"column:p_id" json:"pId"`
+	PromotionAmount       int64           `gorm:"column:promotion_amount" json:"promotionAmount"`
+	UpdateTime            string          `gorm:"column:update_time" json:"updateTime"`
+	OrderCreateTime       string          `gorm:"column:order_create_time" json:"orderCreateTime"`
+	OrderSn               string          `gorm:"column:order_sn" json:"orderSn"`
+	Amount                decimal.Decimal `gorm:"column:amount" json:"amount"`
+	Amount1               decimal.Decimal `gorm:"column:amount_1" json:"amount1"`
+	Amount2               decimal.Decimal `gorm:"column:amount_2" json:"amount2"`
 }
 
 // TableName sets the insert table name for this struct type

models/pdd/pdd.ddk.order.list.increment.get.go

@@ -39,7 +39,7 @@ type OrderList struct {
 	IsDirect                   int    `json:"is_direct"`
 	MallID                     int    `json:"mall_id"`
 	OrderAmount                int    `json:"order_amount"`
-	OrderCreateTime            int    `json:"order_create_time"`
+	OrderCreateTime            int64  `json:"order_create_time"`
 	OrderGroupSuccessTime      int64  `json:"order_group_success_time"`
 	OrderID                    string `json:"order_id"`
 	OrderModifyAt              int    `json:"order_modify_at"`
@@ -53,7 +53,7 @@ type OrderList struct {
 	PID                        string `json:"p_id"`
 	PointTime                  int    `json:"point_time"`
 	PriceCompareStatus         int    `json:"price_compare_status"`
-	PromotionAmount            int    `json:"promotion_amount"`
+	PromotionAmount            int64  `json:"promotion_amount"`
 	PromotionRate              int    `json:"promotion_rate"`
 	ReturnStatus               int    `json:"return_status"`
 	SepDuoID                   int    `json:"sep_duo_id"`

report/pdd.ddk.order.list.increment.get.go

@@ -85,6 +85,11 @@ func DdkOrder() {
 			sqlData.OrderStatusDesc = outData.OrderListGetResponse.OrderList[i].OrderStatusDesc
 			sqlData.PromotionAmount = outData.OrderListGetResponse.OrderList[i].PromotionAmount
 			sqlData.JSONData, _ = tools.JsonMarshal(&outData.OrderListGetResponse.OrderList[i])
+			sqlData.OrderCreateTime = tools.TimeToStr(outData.OrderListGetResponse.OrderList[i].OrderCreateTime)
+			sqlData.OrderSn = outData.OrderListGetResponse.OrderList[i].OrderSn
+			sqlData.Amount = decimal.NewFromInt(outData.OrderListGetResponse.OrderList[i].PromotionAmount).Mul(decimal.NewFromFloat(0.005))
+			sqlData.Amount1 = decimal.NewFromInt(outData.OrderListGetResponse.OrderList[i].PromotionAmount).Mul(decimal.NewFromFloat(0.0015))
+			sqlData.Amount1 = decimal.NewFromInt(outData.OrderListGetResponse.OrderList[i].PromotionAmount).Mul(decimal.NewFromFloat(0.001))
 
 			count := sqlData.GetNum()
 			if count <= 0 {