diff --git a/business/lakala/lakala_incoming.go b/business/lakala/lakala_incoming.go index ac6fae119..b0a3845b4 100644 --- a/business/lakala/lakala_incoming.go +++ b/business/lakala/lakala_incoming.go @@ -583,7 +583,7 @@ func SeparateResultQuery(merchantNo, separateNo string) (*lakala.SeparateResultQ recordsObj.Status = result.Status recordsObj.SeparateNo = result.SeparateNo recordsObj.OutSeparateNo = result.OutSeparateNo - + recordsObj.TotalAmt = result.TotalAmt recv := make([]*lakala.RecvDatasParam, 0, 0) for _, v := range result.DetailDatas { recv = append(recv, &lakala.RecvDatasParam{ diff --git a/business/partner/purchase/jx/localjx/lakala_pay.go b/business/partner/purchase/jx/localjx/lakala_pay.go index 8758e8edf..9e0116882 100644 --- a/business/partner/purchase/jx/localjx/lakala_pay.go +++ b/business/partner/purchase/jx/localjx/lakala_pay.go @@ -94,6 +94,9 @@ func RefundOrderByLaKaLa(ctx *jxcontext.Context, orderPay *model.OrderPay, afsOr } resp, err := api.LaKaLaApi.RefundOrder(param) + if err != nil { + return nil, err + } orderPayRefund = &model.OrderPayRefund{ RefundID: refundID, VendorRefundID: resp.LogNo, @@ -104,15 +107,10 @@ func RefundOrderByLaKaLa(ctx *jxcontext.Context, orderPay *model.OrderPay, afsOr RefundFee: refundFee, RefundCreatedAt: time.Now(), } - if err == nil { - orderPayRefund.Status = model.RefundStatusYes - orderPayRefund.OriginalData = utils.Format4Output(resp, true) - orderPay.Status = model.PayStatusRefund - dao.UpdateEntity(db, orderPay, "Status") - } else { - orderPayRefund.Status = model.RefundStatusNo - orderPayRefund.OriginalData = err.Error() - } + orderPayRefund.Status = model.RefundStatusYes + orderPayRefund.OriginalData = utils.Format4Output(resp, true) + orderPay.Status = model.PayStatusRefund + dao.UpdateEntity(db, orderPay, "Status") dao.WrapAddIDCULDEntity(orderPayRefund, ctx.GetUserName()) dao.CreateEntity(db, orderPayRefund) case lakala.PayWayMini, lakala.PayWayRegister: // 主扫被扫 @@ -128,6 +126,9 @@ func RefundOrderByLaKaLa(ctx *jxcontext.Context, orderPay *model.OrderPay, afsOr LocationInfo: lakala.LocationInfoObj{RequestIp: ctx.GetRealRemoteIP()}, } resp, err := api.LaKaLaApi.AggregateRefund(param) + if err != nil { + return nil, err + } orderPayRefund = &model.OrderPayRefund{ RefundID: refundID, VendorRefundID: resp.LogNo, @@ -138,16 +139,10 @@ func RefundOrderByLaKaLa(ctx *jxcontext.Context, orderPay *model.OrderPay, afsOr RefundFee: refundFee, RefundCreatedAt: time.Now(), } - if err == nil { - orderPayRefund.Status = model.RefundStatusYes - orderPayRefund.OriginalData = utils.Format4Output(resp, true) - orderPay.Status = model.PayStatusRefund - dao.UpdateEntity(db, orderPay, "Status") - } else { - orderPayRefund.Status = model.RefundStatusNo - orderPayRefund.OriginalData = err.Error() - } - + orderPayRefund.Status = model.RefundStatusYes + orderPayRefund.OriginalData = utils.Format4Output(resp, true) + orderPay.Status = model.PayStatusRefund + dao.UpdateEntity(db, orderPay, "Status") dao.WrapAddIDCULDEntity(orderPayRefund, ctx.GetUserName()) dao.CreateEntity(db, orderPayRefund) }