- send weixin msg more accurately.

business/controller/order.go

@@ -7,7 +7,6 @@ import (
 	"git.rosy.net.cn/baseapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
-	"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"
@@ -60,7 +59,6 @@ func (c *OrderController) OnOrderNew(order *model.GoodsOrder, msgVendorStatus st
 	if err == nil && !isDuplicated {
 		if isDuplicated, err = c.saveOrder(order, false, db); err == nil && !isDuplicated {
 			err = scheduler.CurrentScheduler.OnOrderNew(order, false)
-			weixinmsg.NotifyNewOrder(order)
 		}
 	}
 	return err
@@ -96,7 +94,6 @@ func (c *OrderController) OnOrderAdjust(order *model.GoodsOrder, msgVendorStatus
 			// 因为订单调度器需要的是真实状态，所以用order的状态
 			err = scheduler.CurrentScheduler.OnOrderNew(order, false)
 			err = scheduler.CurrentScheduler.OnOrderStatusChanged(model.Order2Status(order), false)
-			weixinmsg.NotifyNewOrder(order)
 		}
 	}
 	return err

business/controller/waybill.go

@@ -4,7 +4,6 @@ import (
 	"time"
 
 	"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"
@@ -90,11 +89,6 @@ func (w *WaybillController) OnWaybillStatusChanged(bill *model.Waybill) (err err
 	}
 	if err == nil && !isDuplicated {
 		scheduler.CurrentScheduler.OnWaybillStatusChanged(bill, false)
-		if bill.Status == model.WaybillStatusAccepted || bill.Status == model.WaybillStatusDelivered {
-			if order, err2 := OrderManager.LoadOrder(bill.VendorOrderID, bill.OrderVendorID); err2 == nil {
-				weixinmsg.NotifyWaybillStatus(bill, order)
-			}
-		}
 		if globals.GenerateLegacyJxOrder {
 			w.legacyWaybillStatusChanged(bill, db)
 		}