1

business/lakala/lakala_incoming.go

@@ -517,7 +517,7 @@ func Separate(ctx *jxcontext.Context, param *lakala.OrderSeparateReq) (string, s
 	param.OutSeparateNo = lakala.GetOrderNumber(10)
 	param.NotifyUrl = lakala.CallbackLaKaLaSeparateUrl
 
-	status, separateNo, logNo, err := api.LaKaLaApi.Separate(param)
+	status, separateNo, err := api.LaKaLaApi.Separate(param)
 	if err != nil {
 		return "", "", err
 	}
@@ -530,9 +530,9 @@ func Separate(ctx *jxcontext.Context, param *lakala.OrderSeparateReq) (string, s
 		FinishDate:    "",
 		TotalAmt:      param.TotalAmt,
 		Status:        status,
-		LogNo:         logNo,
-		DetailData:    string(recv),
-		Remark:        "分账",
+		//LogNo:         logNo,
+		DetailData: string(recv),
+		Remark:     "分账",
 	}
 	t, err := time.Parse("20060102", param.LogDate)
 	if err != nil {
@@ -700,7 +700,7 @@ func SubMerchantInfoQuery(merInnerNo, merCupNo string) ([]*lakala.SubMerchantInf
 //#region 订单相关
 
 // CreateOrder 创建拉卡拉交易订单
-func CreateOrder(vendorOrderID, merchantNo string, vendorId int) (*lakala.CreateOrderResp, error) {
+func CreateOrder(ctx *jxcontext.Context, vendorOrderID, merchantNo string, vendorId int) (*lakala.CreateOrderResp, error) {
 	order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorId)
 	if err != nil {
 		return nil, err
@@ -719,6 +719,22 @@ func CreateOrder(vendorOrderID, merchantNo string, vendorId int) (*lakala.Create
 	if err != nil {
 		return nil, err
 	}
+
+	orderPay := &model.OrderPay{
+		PayOrderID:    result.PayOrderNo,
+		PayType:       model.PayTypeLaKaLa,
+		VendorPayType: lakala.PayWayRegister,
+		TransactionID: "",
+		VendorOrderID: order.VendorOrderID,
+		VendorID:      order.VendorID,
+		Status:        0,
+		PayCreatedAt:  time.Now(),
+		PrepayID:      result.PayOrderNo,
+		CodeURL:       "",
+		TotalFee:      int(order.ActualPayPrice),
+	}
+	dao.WrapAddIDCULDEntity(orderPay, ctx.GetUserName())
+	err = dao.CreateEntity(dao.GetDB(), orderPay)
 	return result, nil
 }