- delivery fee added.

- fixed scheduler bug

business/controller/jd/waybill.go

@@ -6,6 +6,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/controller"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
 type WaybillController struct {
@@ -22,6 +23,11 @@ func (c *WaybillController) onWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (
 	order := c.callbackMsg2Waybill(msg)
 	switch msg.DeliveryStatus {
 	case jdapi.DeliveryStatusWait4Grap:
+		if result, err := api.JdAPI.QuerySingleOrder(msg.OrderID); err == nil {
+			order.DesiredFee = utils.Interface2Int64WithDefault(result["orderFreightMoney"], 0) +
+				utils.Interface2Int64WithDefault(result["merchantPaymentDistanceFreightMoney"], 0) +
+				utils.Interface2Int64WithDefault(result["tips"], 0)
+		}
 		order.Status = model.WaybillStatusNew
 	case jdapi.DeliveryStatusAccepted:
 		order.Status = model.WaybillStatusAccepted