- jd new order and adjust order.

business/freshfood/freshfood.go

@@ -128,11 +128,11 @@ func (f *FreshFoodAPI) AccessFreshFood(apiStr string, params url.Values) error {
 }
 
 // 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.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_MODIFY, params)

business/jd/controller/order.go

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

conf/app.conf

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