- Jdorder.Data is not string when Marsha.l

business/jd/controller/order.go

@@ -174,18 +174,18 @@ func newOrder(order *jdapi.CallbackOrderMsg) error {
 
 			resultByteArr := utils.MustMarshal(data)
 			rec.Data = string(resultByteArr)
-			err = globals2.FreshFoodAPI.NewJDOrder(rec, order.StatusID == jdapi.OrderStatusNew)
+			rec.Data4Json = data
-			if err == nil {
+			err = utils.CallFuncLogError(func() error {
 				db := orm.NewOrm()
-				utils.CallFuncLogError(func() error {
 				_, err := db.Update(rec, "Data", "Code", "Msg", "Success", "CityName", "OrderStatus", "OrderStatusTime")
 				return err
 			}, globals2.ErrStrAccessDB)
+			err = utils.CallFuncLogError(func() error {
+				err := globals2.FreshFoodAPI.NewJDOrder(rec, order.StatusID == jdapi.OrderStatusNew)
+				return err
+			}, globals2.ErrStrAccessDB)
 		} else {
-				globals.SugarLogger.Errorf("Error when calling NewJDOrder error:%v", err)
+			globals.SugarLogger.Errorf("can not get jdorder info:%v", order.BillID)
-			}
-		} else {
-			globals.SugarLogger.Warnf("can not get jdorder info:%v", order.BillID)
 		}
 	}
 	return err

business/jd/models/order.go

@@ -4,7 +4,8 @@ type Jdorder struct {
 	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"`
+	Data            string                 `orm:"type(text)" json:"-"`
+	Data4Json       map[string]interface{} `orm:"-" 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"`