From 5187282b7da9c739cf869a5557d00546926eeb17 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 27 Jun 2018 22:38:49 +0800
Subject: [PATCH] - change Jdorder.Success to bool. refine the json field name
 of Jdorder.

---
 business/jd/controller/order.go |  7 +------
 business/jd/models/order.go     | 18 +++++++++---------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/business/jd/controller/order.go b/business/jd/controller/order.go
index eada5aac1..afdd945f5 100644
--- a/business/jd/controller/order.go
+++ b/business/jd/controller/order.go
@@ -158,12 +158,7 @@ func newOrder(order *jdapi.CallbackOrderMsg) error {
 
 		rec.Code, _ = result["code"].(string)
 		rec.Msg, _ = result["msg"].(string)
-		success, _ := result["success"].(bool)
-		if success {
-			rec.Success = 1
-		} else {
-			rec.Success = 0
-		}
+		rec.Success, _ = result["success"].(bool)
 
 		// todo
 		rec.CityName = "all"
diff --git a/business/jd/models/order.go b/business/jd/models/order.go
index e5d20db4f..5581138db 100644
--- a/business/jd/models/order.go
+++ b/business/jd/models/order.go
@@ -1,13 +1,13 @@
 package models
 
 type Jdorder struct {
-	ID              int    `orm:"column(id)"`
-	Code            string `orm:"size(2)"`
-	Msg             string `orm:"size(100)"`
-	Data            string `orm:"type(text)"`
-	Success         int8
-	JdOrderID       int64  `orm:"unique;size(19);column(jdorderid)"`
-	CityName        string `orm:"size(20);column(cityname)"`
-	OrderStatus     int    `orm:"column(orderstatus)"`
-	OrderStatusTime string `orm:"size(50);column(orderstatustime)"`
+	ID              int    `orm:"column(id)" json:"-"`
+	Code            string `orm:"size(2);null" json:"code"`
+	Msg             string `orm:"size(100);null" json:"msg"`
+	Data            string `orm:"type(text)" json:"data"`
+	Success         bool   `orm:"null" json:"success"`
+	JdOrderID       int64  `orm:"unique;size(19);column(jdorderid);null"  json:"jdOrderId"`
+	CityName        string `orm:"size(20);column(cityname)"  json:"cityName"`
+	OrderStatus     int    `orm:"column(orderstatus);null"  json:"orderStatus"`
+	OrderStatusTime string `orm:"size(50);column(orderstatustime);null"  json:"orderStatusTime"`
 }