- weixin msg added.

- elm sometimes have no delivery msg
- elm sometimes delivery msg arrvied before finished pickup
- the gap between finished pickup and first delivery msg is big

business/controller/order.go

@@ -7,6 +7,7 @@ import (
 
 	"git.rosy.net.cn/baseapi"
 	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/globals"
 	"github.com/astaxie/beego/orm"
@@ -27,6 +28,7 @@ func (c *OrderController) OnOrderNew(order *model.GoodsOrder) (err error) {
 	if err == nil && !isDuplicated {
 		if err = c.saveOrder(order, false, db); err == nil {
 			err = scheduler.CurrentScheduler.OnOrderNew(order)
+			weixinmsg.NotifyNewOrder(order)
 		}
 	}
 	return err

business/controller/waybill.go

@@ -2,6 +2,7 @@ package controller
 
 import (
 	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/scheduler"
 	"git.rosy.net.cn/jx-callback/globals"
@@ -55,6 +56,11 @@ func (w *WaybillController) OnWaybillStatusChanged(bill *model.Waybill) (err err
 			}
 		}
 	}
+	if bill.Status == model.WaybillStatusAccepted || bill.Status == model.WaybillStatusDelivered {
+		if order, err2 := OrderManager.LoadOrder(bill.VendorOrderID, bill.OrderVendorID); err2 == nil {
+			weixinmsg.NotifyWaybillStatus(bill, order)
+		}
+	}
 	return err
 }