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

- jd new order and adjust order.

Browse Source
This commit is contained in:
gazebo
2018-06-27 18:34:30 +08:00
parent 5d6a2964c2
commit 54866686ac
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/freshfood/freshfood.go
View File

@@ -128,11 +128,11 @@ func (f *FreshFoodAPI) AccessFreshFood(apiStr string, params url.Values) error {
} }
// jd api // jd api
func (f *FreshFoodAPI) NewJDOrder(jdorder *models.Jdorder) error { func (f *FreshFoodAPI) NewJDOrder(jdorder *models.Jdorder, isNew bool) error {
params := make(url.Values) params := make(url.Values)
params.Set(URL_FRESHFOOD_PARA_JDORDER, string(utils.MustMarshal(jdorder))) params.Set(URL_FRESHFOOD_PARA_JDORDER, string(utils.MustMarshal(jdorder)))
if jdorder.OrderStatus == utils.Str2Int(jdapi.OrderStatusNew) { if isNew {
return f.AccessFreshFood(URL_FRESHFOOD_ORDER_CREATE_JDDJ, params) return f.AccessFreshFood(URL_FRESHFOOD_ORDER_CREATE_JDDJ, params)
} }
return f.AccessFreshFood(URL_FRESHFOOD_ORDER_MODIFY, params) return f.AccessFreshFood(URL_FRESHFOOD_ORDER_MODIFY, params)

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

@@ -179,7 +179,7 @@ func newOrder(order *jdapi.CallbackOrderMsg) error {
resultByteArr := utils.MustMarshal(data) resultByteArr := utils.MustMarshal(data)
rec.Data = string(resultByteArr) rec.Data = string(resultByteArr)
err = globals2.FreshFoodAPI.NewJDOrder(rec) err = globals2.FreshFoodAPI.NewJDOrder(rec, order.StatusID == jdapi.OrderStatusNew)
if err == nil { if err == nil {
db := orm.NewOrm() db := orm.NewOrm()
utils.CallFuncLogError(func() error { utils.CallFuncLogError(func() error {

6
conf/app.conf
View File

@@ -11,7 +11,7 @@ dadaAppKey = "dada9623324449cd250"
dadaAppSecret = "30c2abbfe8a8780ad5aace46300c64b9" dadaAppSecret = "30c2abbfe8a8780ad5aace46300c64b9"
[dev] [dev]
freshFoodServerURL = "http://test.jxc4.com" freshFoodServerURL = "http://portal.alpha.int.jxc4.com"
jdToken = "c8854ef2-f80a-45ee-aceb-dc8014d646f8" jdToken = "c8854ef2-f80a-45ee-aceb-dc8014d646f8"
jdAppKey = "06692746f7224695ad4788ce340bc854" jdAppKey = "06692746f7224695ad4788ce340bc854"
@@ -26,7 +26,7 @@ mtpsAppKey = "25e816550bc9484480642f19a95f13fd"
mtpsSecret = "r4$HqrKx9~=7?2Jfo,$Z~a7%~k!Au&pEdI2)oPJvSbH2ao@2N0[8wSIvtuumh_J^" mtpsSecret = "r4$HqrKx9~=7?2Jfo,$Z~a7%~k!Au&pEdI2)oPJvSbH2ao@2N0[8wSIvtuumh_J^"
dadaIsProd = false dadaIsProd = false
dadaCallbackURL = "http://callback.jxc4.com/dada/order" dadaCallbackURL = "http://callback.test.jxc4.com/dada/order"
dadaSourceID = "73753" dadaSourceID = "73753"
weixinAppID = "wxbf235770edaabc5c" weixinAppID = "wxbf235770edaabc5c"
@@ -50,7 +50,7 @@ mtpsAppKey = "3c0a05d464c247c19d7ec13accc78605"
mtpsSecret = "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE" mtpsSecret = "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE"
dadaIsProd = true dadaIsProd = true
dadaCallbackURL = "http://portal.jingxicaishi.com/dada/order" dadaCallbackURL = "http://callback.jingxicaishi.com/dada/order"
dadaSourceID = "6660" dadaSourceID = "6660"
weixinAppID = "wx2bb99eb5d2c9b82c" weixinAppID = "wx2bb99eb5d2c9b82c"