1

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 {

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