This commit is contained in:
邹宗楠
2025-08-06 09:32:25 +08:00
parent 40fea113f1
commit e8e3eb7c09
2 changed files with 6 additions and 6 deletions

View File

@@ -86,8 +86,8 @@ func RefundOrderByLaKaLa(ctx *jxcontext.Context, orderPay *model.OrderPay, afsOr
RefundAmount: utils.Int2Str(refundFee), RefundAmount: utils.Int2Str(refundFee),
OriginBizType: "3", OriginBizType: "3",
OriginTradeDate: order.OrderCreatedAt.Format("20060102"), OriginTradeDate: order.OrderCreatedAt.Format("20060102"),
OriginLogNo: "", OriginLogNo: order.VendorOrderID2,
OriginTradeNo: order.VendorOrderID, OriginTradeNo: "",
OriginCardNo: "", OriginCardNo: "",
LocationInfo: nil, LocationInfo: nil,
RefundType: "", RefundType: "",
@@ -96,7 +96,7 @@ func RefundOrderByLaKaLa(ctx *jxcontext.Context, orderPay *model.OrderPay, afsOr
resp, err := api.LaKaLaApi.RefundOrder(param) resp, err := api.LaKaLaApi.RefundOrder(param)
orderPayRefund = &model.OrderPayRefund{ orderPayRefund = &model.OrderPayRefund{
RefundID: refundID, RefundID: refundID,
VendorRefundID: resp.OriginTradeNo, VendorRefundID: resp.LogNo,
VendorOrderID: orderPay.VendorOrderID, VendorOrderID: orderPay.VendorOrderID,
VendorID: orderPay.VendorID, VendorID: orderPay.VendorID,
Status: model.RefundStatusYes, Status: model.RefundStatusYes,
@@ -130,7 +130,7 @@ func RefundOrderByLaKaLa(ctx *jxcontext.Context, orderPay *model.OrderPay, afsOr
resp, err := api.LaKaLaApi.AggregateRefund(param) resp, err := api.LaKaLaApi.AggregateRefund(param)
orderPayRefund = &model.OrderPayRefund{ orderPayRefund = &model.OrderPayRefund{
RefundID: refundID, RefundID: refundID,
VendorRefundID: resp.OriginTradeNo, VendorRefundID: resp.LogNo,
VendorOrderID: orderPay.VendorOrderID, VendorOrderID: orderPay.VendorOrderID,
VendorID: orderPay.VendorID, VendorID: orderPay.VendorID,
Status: model.RefundStatusYes, Status: model.RefundStatusYes,
@@ -286,7 +286,7 @@ func BarCodeScannerPayByLaKaLa(ctx *jxcontext.Context, vendorOrderId, userPaymen
TotalFeeAmt: "", TotalFeeAmt: "",
FinalStatus: "", FinalStatus: "",
DetailData: "", DetailData: "",
Remark: "聚合被扫订单", Remark: "扫码枪支付",
} }
dao.WrapAddIDCULEntity(separate, ctx.GetUserName()) dao.WrapAddIDCULEntity(separate, ctx.GetUserName())
dao.CreateEntity(db, separate) dao.CreateEntity(db, separate)

View File

@@ -458,7 +458,7 @@ func addRefundSku(ctx *jxcontext.Context, goodsOrder *model.GoodsOrder, skuIds m
RefundType: model.AfsTypePartRefund, RefundType: model.AfsTypePartRefund,
VendorOrgCode: "0", VendorOrgCode: "0",
RefundMoney: int64(refundMoney), RefundMoney: int64(refundMoney),
Status: model.AfsOrderStatusNew, Status: model.AfsOrderStatusWait4Approve,
Flag: 0, Flag: 0,
AfsTotalShopMoney: goodsOrder.ActualPayPrice - int64(refundMoney), AfsTotalShopMoney: goodsOrder.ActualPayPrice - int64(refundMoney),
} }