liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Jdorder.Data is not string when Marsha.l

Browse Source
This commit is contained in:
gazebo
2018-06-28 09:48:30 +08:00
parent 5187282b7d
commit acfb2512f5
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
business/jd/controller/order.go
View File

@@ -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)
if err == nil {
rec.Data4Json = data
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)
} else {
globals.SugarLogger.Errorf("Error when calling NewJDOrder error:%v", err)
}
_, 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.Warnf("can not get jdorder info:%v", order.BillID)
globals.SugarLogger.Errorf("can not get jdorder info:%v", order.BillID)
}
}
return err

19
business/jd/models/order.go
View File

@@ -1,13 +1,14 @@
package models
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"`
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"`
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:"-"`
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"`
OrderStatus int `orm:"column(orderstatus);null" json:"orderStatus"`
OrderStatusTime string `orm:"size(50);column(orderstatustime);null" json:"orderStatusTime"`
}