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

- refactor auto accept order, explicit refuse added.

Browse Source
This commit is contained in:
gazebo
2018-07-02 22:39:16 +08:00
parent 009f67fff5
commit 8a75fb9beb
4 changed files with 54 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,15 +144,10 @@ func (c *OrderController) OrderDeliveryStatus(jdOrderDeliveryStatusMsg *jdapi.Ca
}
//-----------
func acceptOrder(msg *jdapi.CallbackOrderMsg, userMobile string, db orm.Ormer) {
if controllers.IsAutoAcceptOrder(userMobile, db) {
globals2.Jdapi.OrderAcceptOperate(msg.BillID, true)
if userMobile == "" {
globals.SugarLogger.Infof("jd order:%v force accepted, because userMobile is empty", msg)
}
} else {
globals.SugarLogger.Infof("jd order:%v refused, userMobile:%s", msg, userMobile)
}
func OnNewOrder(msg *jdapi.CallbackOrderMsg, userMobile string, db orm.Ormer) {
controllers.OnNewOrder(msg.BillID, controllers.JD_VENDERID, userMobile, 0, db, func(acceptIt bool) {
globals2.Jdapi.OrderAcceptOperate(msg.BillID, acceptIt)
})
}
func newOrder(msg *jdapi.CallbackOrderMsg) error {
@@ -197,7 +192,7 @@ func newOrder(msg *jdapi.CallbackOrderMsg) error {
globals.SugarLogger.Errorf("can not get jdorder info:%v", msg.BillID)
}
}
acceptOrder(msg, userMobile, db)
OnNewOrder(msg, userMobile, db)
return err
}