From e8e3eb7c09f05f12a3a93f7e0fb14dc218efaa70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 6 Aug 2025 09:32:25 +0800 Subject: [PATCH] 1 --- business/partner/purchase/jx/localjx/lakala_pay.go | 10 +++++----- .../partner/purchase/jx/localjx/tonglianpay_gun.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/business/partner/purchase/jx/localjx/lakala_pay.go b/business/partner/purchase/jx/localjx/lakala_pay.go index 5bc9fde8e..8758e8edf 100644 --- a/business/partner/purchase/jx/localjx/lakala_pay.go +++ b/business/partner/purchase/jx/localjx/lakala_pay.go @@ -86,8 +86,8 @@ func RefundOrderByLaKaLa(ctx *jxcontext.Context, orderPay *model.OrderPay, afsOr RefundAmount: utils.Int2Str(refundFee), OriginBizType: "3", OriginTradeDate: order.OrderCreatedAt.Format("20060102"), - OriginLogNo: "", - OriginTradeNo: order.VendorOrderID, + OriginLogNo: order.VendorOrderID2, + OriginTradeNo: "", OriginCardNo: "", LocationInfo: nil, RefundType: "", @@ -96,7 +96,7 @@ func RefundOrderByLaKaLa(ctx *jxcontext.Context, orderPay *model.OrderPay, afsOr resp, err := api.LaKaLaApi.RefundOrder(param) orderPayRefund = &model.OrderPayRefund{ RefundID: refundID, - VendorRefundID: resp.OriginTradeNo, + VendorRefundID: resp.LogNo, VendorOrderID: orderPay.VendorOrderID, VendorID: orderPay.VendorID, Status: model.RefundStatusYes, @@ -130,7 +130,7 @@ func RefundOrderByLaKaLa(ctx *jxcontext.Context, orderPay *model.OrderPay, afsOr resp, err := api.LaKaLaApi.AggregateRefund(param) orderPayRefund = &model.OrderPayRefund{ RefundID: refundID, - VendorRefundID: resp.OriginTradeNo, + VendorRefundID: resp.LogNo, VendorOrderID: orderPay.VendorOrderID, VendorID: orderPay.VendorID, Status: model.RefundStatusYes, @@ -286,7 +286,7 @@ func BarCodeScannerPayByLaKaLa(ctx *jxcontext.Context, vendorOrderId, userPaymen TotalFeeAmt: "", FinalStatus: "", DetailData: "", - Remark: "聚合被扫订单", + Remark: "扫码枪支付", } dao.WrapAddIDCULEntity(separate, ctx.GetUserName()) dao.CreateEntity(db, separate) diff --git a/business/partner/purchase/jx/localjx/tonglianpay_gun.go b/business/partner/purchase/jx/localjx/tonglianpay_gun.go index 690f33789..9f0e96a84 100644 --- a/business/partner/purchase/jx/localjx/tonglianpay_gun.go +++ b/business/partner/purchase/jx/localjx/tonglianpay_gun.go @@ -458,7 +458,7 @@ func addRefundSku(ctx *jxcontext.Context, goodsOrder *model.GoodsOrder, skuIds m RefundType: model.AfsTypePartRefund, VendorOrgCode: "0", RefundMoney: int64(refundMoney), - Status: model.AfsOrderStatusNew, + Status: model.AfsOrderStatusWait4Approve, Flag: 0, AfsTotalShopMoney: goodsOrder.ActualPayPrice - int64(refundMoney), }