liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2024-01-18 09:11:17 +08:00
parent 5ad08aeb2d 6562bcaf8e
commit 2d94a361b3
4 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/partner/delivery/delivery.go
View File

@@ -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 {

15
business/partner/purchase/mtwm/order_afs.go
View File

@@ -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", "成功"))
}
}
}
}

18
business/partner/purchase/mtwm/store.go
View File

@@ -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), "!")
}
}

4
controllers/jx_order.go
View File

@@ -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
})