- mtwm save order related status

business/partner/purchase/mtwm/mtwm.go

@@ -22,7 +22,7 @@ type PurchaseHandler struct {
 
 func init() {
 	curPurchaseHandler = new(PurchaseHandler)
-	// partner.RegisterPurchasePlatform(curPurchaseHandler)
+	partner.RegisterPurchasePlatform(curPurchaseHandler)
 }
 
 func (c *PurchaseHandler) GetVendorID() int {

business/partner/purchase/mtwm/order.go

@@ -131,7 +131,7 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *mtwmapi.CallbackMsg) *model.Or
 	orderID := GetOrderIDFromMsg(msg)
 	vendorStatus := ""
 	remark := ""
-	statusTime := time.Now().Unix()
+	statusTime := utils.Str2Int64(msg.Data.Get("timestamp"))
 	switch msg.Cmd {
 	case mtwmapi.MsgTypeUserUrgeOrder, mtwmapi.MsgTypeOrderModified, mtwmapi.MsgTypeOrderFinancial:
 		vendorStatus = msg.Cmd
@@ -161,6 +161,40 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *mtwmapi.CallbackMsg) *model.Or
 	return orderStatus
 }
 
+func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
+	if globals.EnableStoreWrite && globals.EnableMtwmStoreWrite {
+		if isAcceptIt {
+			err = api.MtwmAPI.OrderReceived(utils.Str2Int64(order.VendorOrderID))
+		} else {
+			err = api.MtwmAPI.OrderCancel(utils.Str2Int64(order.VendorOrderID))
+		}
+	}
+	return err
+}
+
+func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, userName string) (err error) {
+	if globals.EnableStoreWrite && globals.EnableMtwmStoreWrite {
+		err = api.MtwmAPI.OrderConfirm(utils.Str2Int64(order.VendorOrderID))
+	}
+	return nil
+}
+
+func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) {
+	return err
+}
+
+func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error) {
+	return nil
+}
+
+func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
+	return err
+}
+
+func (c *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) {
+	return err
+}
+
 func getTimeFromTimestamp(timeStamp int64) time.Time {
 	if timeStamp < 1538103149 { // 立即达订单给的是1（而不是空，0），1538103149不是特殊值，只是一个任意之前的时间，这样写可以处理
 		return utils.DefaultTimeValue

business/partner/purchase/mtwm/waybill.go

@@ -32,6 +32,7 @@ func (c *PurchaseHandler) onWaybillMsg(msg *mtwmapi.CallbackMsg) (response *mtwm
 
 func (c *PurchaseHandler) callbackMsg2Waybill(msg *mtwmapi.CallbackMsg) (retVal *model.Waybill) {
 	orderID := GetOrderIDFromMsg(msg)
+	vendorStatus := msg.Data.Get("logistics_status")
 	retVal = &model.Waybill{
 		VendorOrderID:   orderID,
 		OrderVendorID:   model.VendorIDMTWM,
@@ -39,7 +40,8 @@ func (c *PurchaseHandler) callbackMsg2Waybill(msg *mtwmapi.CallbackMsg) (retVal
 		WaybillVendorID: model.VendorIDMTWM,
 		CourierName:     msg.Data.Get("dispatcher_name"),
 		CourierMobile:   msg.Data.Get("dispatcher_mobile"),
-		VendorStatus:    msg.Data.Get("logistics_status"),
+		VendorStatus:    vendorStatus,
+		Status:          c.GetWaybillStatusFromVendorStatus(vendorStatus),
 		StatusTime:      getTimeFromTimestamp(utils.Str2Int64(msg.Data.Get("time"))),
 		Remark:          "",
 	}