- add API CancelAll3rdWaybills

- sync all order related APIs

business/jxcallback/scheduler/basesch/basesch_ext.go

@@ -36,6 +36,8 @@ func (c *BaseScheduler) CreateWaybillOnProviders(order *model.GoodsOrder, userNa
 }
 
 func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (err error) {
+	jxutils.CallMsgHandler(func() {
+		err = func() (err error) {
 			globals.SugarLogger.Infof("SelfDeliveredAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName)
 			order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
 			if err == nil {
@@ -54,9 +56,14 @@ func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, ven
 			}
 			globals.SugarLogger.Infof("SelfDeliveredAndUpdateStatus orderID:%s userName:%s error:%v", vendorOrderID, userName, err)
 			return err
+		}()
+	}, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID))
+	return err
 }
 
 func (c *BaseScheduler) PickupGoodsAndUpdateStatus(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (err error) {
+	jxutils.CallMsgHandler(func() {
+		err = func() (err error) {
 			globals.SugarLogger.Infof("PickupGoodsAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName)
 			order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
 			if err == nil {
@@ -71,6 +78,9 @@ func (c *BaseScheduler) PickupGoodsAndUpdateStatus(ctx *jxcontext.Context, vendo
 			}
 			globals.SugarLogger.Infof("PickupGoodsAndUpdateStatus orderID:%s userName:%s error:%v", vendorOrderID, userName, err)
 			return err
+		}()
+	}, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID))
+	return err
 }
 
 func GetStoreDeliveryType(order *model.GoodsOrder, storeMap *model.StoreMap) (deliveryType int) {

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -13,6 +13,8 @@ import (
 )
 
 func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (err error) {
+	jxutils.CallMsgHandler(func() {
+		err = func() (err error) {
 			globals.SugarLogger.Infof("SelfDeliveringAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName)
 			status := &model.OrderStatus{
 				RefVendorOrderID: vendorOrderID,
@@ -49,16 +51,14 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
 			}
 			globals.SugarLogger.Infof("SelfDeliveringAndUpdateStatus orderID:%s userName:%s error:%v", vendorOrderID, userName, err)
 			return err
-}
+		}()
-
-func (s *DefScheduler) SelfDeliveringAndUpdateStatusExt(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (err error) {
-	jxutils.CallMsgHandler(func() {
-		err = s.SelfDeliveringAndUpdateStatus(ctx, vendorOrderID, vendorID, userName)
 	}, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID))
 	return err
 }
 
 func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendorOrderID string, vendorID int, forceCreate bool) (bills []*model.Waybill, err error) {
+	jxutils.CallMsgHandler(func() {
+		bills, err = func() (bills []*model.Waybill, err error) {
 			userName := ctx.GetUserName()
 			globals.SugarLogger.Debugf("CreateWaybillOnProvidersEx orderID:%s userName:%s", vendorOrderID, userName)
 			if vendorID == model.VendorIDELM {
@@ -92,4 +92,28 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor
 			}
 			globals.SugarLogger.Infof("CreateWaybillOnProvidersEx orderID:%s userName:%s error:%v", vendorOrderID, userName, err)
 			return bills, err
+		}()
+	}, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID))
+	return bills, err
+}
+
+func (s *DefScheduler) CancelAll3rdWaybills(ctx *jxcontext.Context, vendorOrderID string, vendorID int) (err error) {
+	jxutils.CallMsgHandler(func() {
+		err = func() (err error) {
+			globals.SugarLogger.Infof("CancelAll3rdWaybills orderID:%s userName:%s", vendorOrderID, ctx.GetUserName())
+			status := &model.OrderStatus{
+				RefVendorOrderID: vendorOrderID,
+				RefVendorID:      vendorID,
+			}
+			savedOrderInfo := s.loadSavedOrderFromMap(status, false)
+			if savedOrderInfo != nil {
+				err = s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)
+			} else {
+				err = scheduler.ErrCanNotFindOrder
+			}
+			globals.SugarLogger.Infof("CancelAll3rdWaybills orderID:%s userName:%s error:%v", vendorOrderID, ctx.GetUserName(), err)
+			return err
+		}()
+	}, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID))
+	return err
 }

controllers/jx_order.go

@@ -55,7 +55,7 @@ func (c *OrderController) FinishedPickup() {
 // @router /SelfDelivering [post]
 func (c *OrderController) SelfDelivering() {
 	c.callSelfDelivering(func(params *tOrderSelfDeliveringParams) (retVal interface{}, errCode string, err error) {
-		err = defsch.FixedScheduler.SelfDeliveringAndUpdateStatusExt(params.Ctx, params.VendorOrderID, params.VendorID, params.Ctx.GetUserName())
+		err = defsch.FixedScheduler.SelfDeliveringAndUpdateStatus(params.Ctx, params.VendorOrderID, params.VendorID, params.Ctx.GetUserName())
 		return nil, "", err
 	})
 }
@@ -91,6 +91,21 @@ func (c *OrderController) CreateWaybillOnProviders() {
 	})
 }
 
+// @Title 取消所有三方运单
+// @Description 取消所有三方运单
+// @Param	token			header		string	true	"认证token"
+// @Param	vendorOrderID	formData	string	true	"订单ID"
+// @Param	vendorID		formData	int		true	"订单所属的厂商ID"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /CancelAll3rdWaybills [post]
+func (c *OrderController) CancelAll3rdWaybills() {
+	c.callCancelAll3rdWaybills(func(params *tOrderCancelAll3rdWaybillsParams) (retVal interface{}, errCode string, err error) {
+		err = defsch.FixedScheduler.CancelAll3rdWaybills(params.Ctx, params.VendorOrderID, params.VendorID)
+		return retVal, "", err
+	})
+}
+
 // @Title 得到门店订单信息
 // @Description 得到门店订单信息
 // @Param	token		header	string	true	"认证token"

routers/commentsRouter_controllers.go

@@ -311,6 +311,14 @@ func init() {
 			MethodParams: param.Make(),
 			Params: nil})
 
+	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
+		beego.ControllerComments{
+			Method: "CancelAll3rdWaybills",
+			Router: `/CancelAll3rdWaybills`,
+			AllowHTTPMethods: []string{"post"},
+			MethodParams: param.Make(),
+			Params: nil})
+
 	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
 		beego.ControllerComments{
 			Method: "CreateWaybillOnProviders",