1

business/partner/purchase/jx/localjx/lakala_pay_mini.go

@@ -85,9 +85,9 @@ func pay4OrderByLaKaLa(ctx *jxcontext.Context, order *model.GoodsOrder, payType
 	result, err := api.LaKaLaApi.AggregatePay(param)
 	if err == nil {
 		orderPay = &model.OrderPay{
-			PayOrderID:    param.OutTradeNo,
+			PayOrderID:    result.TradeNo,
 			PayType:       payType,
-			VendorPayType: vendorPayType,
+			VendorPayType: lakala.PayWayMini,
 			TransactionID: result.LogNo,
 			VendorOrderID: order.VendorOrderID,
 			VendorID:      order.VendorID,
@@ -102,6 +102,9 @@ func pay4OrderByLaKaLa(ctx *jxcontext.Context, order *model.GoodsOrder, payType
 			orderPay.CodeURL = utils.LimitUTF8StringLen(string(fields), 3200)
 		}
 	}
+	order.VendorOrderID2 = result.LogNo
+	dao.UpdateEntity(dao.GetDB(), order, "VendorOrderID2")
+
 	return orderPay, err
 }
 
@@ -124,7 +127,7 @@ func OnLaKaLaPayCallback(call *lakala.PayStatusCallBack) (err error) {
 // onLaKaLaPayFinished 订单支付成功或失败
 func onLaKaLaPayFinished(call *lakala.PayStatusCallBack) (err error) {
 	orderPay := &model.OrderPay{
-		PayOrderID: call.OutTradeNo,
+		PayOrderID: call.TradeNo,
 	}
 	orderPay.DeletedAt = utils.DefaultTimeValue
 	db := dao.GetDB()
@@ -154,7 +157,7 @@ func onLaKaLaPayFinished(call *lakala.PayStatusCallBack) (err error) {
 // onLaKaLaOrderCancel 订单取消或撤单
 func onLaKaLaOrderCancel(call *lakala.PayStatusCallBack) (err error) {
 	orderPay := &model.OrderPay{
-		PayOrderID: call.OutTradeNo,
+		PayOrderID: call.TradeNo,
 	}
 	orderPay.DeletedAt = utils.DefaultTimeValue
 	db := dao.GetDB()
@@ -173,7 +176,7 @@ func onLaKaLaOrderCancel(call *lakala.PayStatusCallBack) (err error) {
 
 func onLaKaLaPayRefund(call *lakala.PayStatusCallBack) (err error) {
 	orderPayRefund := &model.OrderPayRefund{
-		RefundID: call.OutTradeNo,
+		RefundID: call.TradeNo,
 	}
 	db := dao.GetDB()
 	if err = dao.GetEntity(db, orderPayRefund, "RefundID"); err != nil && err == orm.ErrNoRows {