This commit is contained in:
邹宗楠
2023-04-06 18:25:51 +08:00
parent 49159ebcd8
commit f2855fa9ec
11 changed files with 348 additions and 24 deletions

View File

@@ -335,6 +335,11 @@ func Pay4Order(ctx *jxcontext.Context, orderID int64, payType int, vendorPayType
dao.WrapAddIDCULDEntity(orderPay, ctx.GetUserName())
err = dao.CreateEntity(dao.GetDB(), orderPay)
}
case model.PayTypeKuaiShou:
if orderPay, err = pay4OrderByKs(ctx, order, vendorPayType, subAppID); err == nil && orderPay != nil {
dao.WrapAddIDCULDEntity(orderPay, ctx.GetUserName())
err = dao.CreateEntity(dao.GetDB(), orderPay)
}
default:
err = fmt.Errorf("支付方式:%d当前不支持", payType)
}
@@ -1393,7 +1398,8 @@ func CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string)
// refundID := utils.Int64ToStr(GenRefundID(order))
refundID := order.VendorOrderID
var orderPayRefund *model.OrderPayRefund
if orderPay.PayType == model.PayTypeWX {
switch orderPay.PayType {
case model.PayTypeWX:
orderPayRefund, err = refundOrderByWX(ctx, orderPay, refundID, orderPay.TotalFee, reason)
if err == nil {
dao.WrapAddIDCULDEntity(orderPayRefund, ctx.GetUserName())
@@ -1401,17 +1407,23 @@ func CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string)
} else {
errList.AddErr(err)
}
} else if orderPay.PayType == model.PayTypeTL {
case model.PayTypeTL:
orderPayRefund, err = RefundOrderByTL(ctx, orderPay, refundID, orderPay.TotalFee, reason)
if err != nil {
errList.AddErr(err)
}
} else if orderPay.PayType == model.PayTypeTicTok {
case model.PayTypeTicTok:
orderPayRefund, err = RefundOrderByTT(ctx, orderPay, refundID, orderPay.TotalFee, reason)
if err != nil {
errList.AddErr(err)
}
case model.PayTypeKuaiShou:
orderPayRefund, err = RefundOrderByKS(ctx, orderPay, refundID, orderPay.TotalFee, reason)
if err != nil {
errList.AddErr(err)
}
}
if err == nil {
//如果用了优惠券,状态要刷回去
if order.CouponIDs != "" {