From b09906d1fe4dfc3df8ab0b162b6fa402c7e29b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 17 Jan 2024 10:23:18 +0800 Subject: [PATCH 1/3] 1 --- controllers/jx_order.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/jx_order.go b/controllers/jx_order.go index 317374bca..dee93abde 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -122,7 +122,7 @@ func (c *OrderController) QueryOrderWaybillFeeInfo() { // @Param vendorOrderID formData string true "订单ID" // @Param vendorID formData int true "订单所属的厂商ID" // @Param courierVendorIDs formData string false "运单厂商ID（缺省全部）" -// @Param maxDeliveryFee formData int false "最高限价（为0时为缺省最大值）" +// @Param maxAddFee formData int false "最高限价（为0时为缺省最大值）" // @Param forceCreate formData bool false "是否强制创建（忽略订单状态检查及其它参数）" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult @@ -131,7 +131,7 @@ func (c *OrderController) CreateWaybillOnProviders() { c.callCreateWaybillOnProviders(func(params *tOrderCreateWaybillOnProvidersParams) (retVal interface{}, errCode string, err error) { var courierVendorIDs []int if err = jxutils.Strings2Objs(params.CourierVendorIDs, &courierVendorIDs); err == nil { - retVal, errCode, err = defsch.FixedScheduler.CreateWaybillOnProvidersEx(params.Ctx, params.VendorOrderID, params.VendorID, courierVendorIDs, params.ForceCreate, int64(params.MaxDeliveryFee)) + retVal, errCode, err = defsch.FixedScheduler.CreateWaybillOnProvidersEx(params.Ctx, params.VendorOrderID, params.VendorID, courierVendorIDs, params.ForceCreate, int64(params.MaxAddFee)) } return retVal, errCode, err }) From ab8946c5213e09cb258d881da1c0758bd226a708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 17 Jan 2024 15:38:39 +0800 Subject: [PATCH 2/3] 1 --- business/partner/delivery/delivery.go | 2 +- business/partner/purchase/mtwm/order_afs.go | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/business/partner/delivery/delivery.go b/business/partner/delivery/delivery.go index 8abc288cd..c29b87d75 100644 --- a/business/partner/delivery/delivery.go +++ b/business/partner/delivery/delivery.go @@ -21,7 +21,7 @@ const ( ) func CallCreateWaybillPolicy(deliveryFee, maxDeliveryFee int64, order *model.GoodsOrder, waybillVendorID int) (err error) { - if maxDeliveryFee <= 0 || maxDeliveryFee > model.DefMaxDeliveryFee { + if maxDeliveryFee <= model.DefMaxDeliveryFee { maxDeliveryFee = model.DefMaxDeliveryFee } if deliveryFee > maxDeliveryFee { diff --git a/business/partner/purchase/mtwm/order_afs.go b/business/partner/purchase/mtwm/order_afs.go index 2c5839675..a400323d9 100644 --- a/business/partner/purchase/mtwm/order_afs.go +++ b/business/partner/purchase/mtwm/order_afs.go @@ -5,6 +5,7 @@ import ( "fmt" "git.rosy.net.cn/jx-callback/globals/api" "net/url" + "strconv" "strings" "git.rosy.net.cn/baseapi/platformapi/mtwmapi" @@ -185,6 +186,20 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma } } } + if order.Status == model.OrderStatusCanceled { + num, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", utils.Int64ToFloat64(order.TotalShopMoney)/float64(100)), 64) + applyErr := getAPI(order.VendorOrgCode, order.StoreID, order.VendorStoreID).ApplyCompensation(&mtwmapi.ApplyCompensationRes{ + OrderId: utils.Str2Int64(order.VendorOrderID), + Reason: "商户申请", + ApplyStatus: mtwmapi.ApplyCompensationStatusOne, + Amount: num, + }) + if applyErr != nil { + partner.CurOrderManager.OnOrderMsg(order, utils.Int2Str(order.Status), fmt.Sprintf("取消订单申请赔付失败:%s", applyErr.Error())) + } else { + partner.CurOrderManager.OnOrderMsg(order, utils.Int2Str(order.Status), fmt.Sprintf("取消订单申请赔付:%s", "成功")) + } + } } } From 6562bcaf8e25cff58687cbeddbb209420d7db77f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 17 Jan 2024 16:21:11 +0800 Subject: [PATCH 3/3] 1 --- business/partner/purchase/mtwm/store.go | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index 42346874b..5ad0a0eb8 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -343,14 +343,11 @@ func (p *PurchaseHandler) onStoreStatusChanged(msg *mtwmapi.CallbackMsg) (respon } } - if err == nil { - if storeStatus == model.StoreStatusDisabled { - switch beego.BConfig.RunMode { - case "jxgy": - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdGuoYuan, fmt.Sprintf("果园美团门店被下线了:门店id[%s],平台门店id[%s]", "暂未获取", vendorStoreID), "!") - default: - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdCaiShi, fmt.Sprintf("菜市美团门店被下线了:门店id[%s],平台门店id[%s]", "暂未获取", vendorStoreID), "!") - } + if err == nil && storeStatus == model.StoreStatusDisabled { + if beego.BConfig.RunMode == "jxgy" { + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdGuoYuan, fmt.Sprintf("果园美团门店被下线了:门店id[%s],平台门店id[%s]", "暂未获取", vendorStoreID), "!") + } else { + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdCaiShi, fmt.Sprintf("菜市美团门店被下线了:门店id[%s],平台门店id[%s]", "暂未获取", vendorStoreID), "!") } err = partner.CurStoreManager.OnStoreStatusChanged(vendorStoreID, model.VendorIDMTWM, storeStatus) } @@ -379,10 +376,9 @@ func (c *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, vendorOrgCod if globals.EnableMtwmStoreWrite { if isOnline != mtwmapi.PoiStatusOnline { if err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiOffline(vendorStoreID); err == nil { - switch beego.BConfig.RunMode { - case "jxgy": + if beego.BConfig.RunMode == "jxgy" { ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdGuoYuan, fmt.Sprintf("果园美团门店被下线了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!") - default: + } else { ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdCaiShi, fmt.Sprintf("菜市美团门店被下线了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!") } }