diff --git a/business/jxstore/cms/order.go b/business/jxstore/cms/order.go index 81aacab20..d7a7867d1 100644 --- a/business/jxstore/cms/order.go +++ b/business/jxstore/cms/order.go @@ -70,6 +70,7 @@ func CreateOrder(ctx *jxcontext.Context, type1, orderType int, way string, price Address: address, DistrictCode: dCode, CityCode: cCode, + PayMethod: 3, } dao.WrapAddIDCULEntity(order, ctx.GetUserName()) if err = dao.CreateEntityTx(txDB, order); err != nil { diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go index 858857592..da5fb2d3a 100644 --- a/business/jxstore/cms/user2.go +++ b/business/jxstore/cms/user2.go @@ -321,6 +321,11 @@ func AddMyDeliveryAddress(ctx *jxcontext.Context, address *model.UserDeliveryAdd return list[0], err } +// GetAddressDetail 获取配送地址详情 +func GetAddressDetail(id int, userId string) { + +} + func DeleteUserDeliveryAddress(ctx *jxcontext.Context, userID string, addressID int) (err error) { num, err := dao.DeleteEntityLogically(dao.GetDB(), &model.UserDeliveryAddress{}, nil, ctx.GetUserName(), map[string]interface{}{ model.FieldID: addressID, diff --git a/business/model/order.go b/business/model/order.go index 74a69f48d..3d188e7a8 100644 --- a/business/model/order.go +++ b/business/model/order.go @@ -70,6 +70,7 @@ type Order struct { CityCode int `orm:"default(0)" json:"cityCode"` //提交订单时用户所在城市 DistrictCode int `orm:"default(0)" json:"districtCode"` // 城市code Address string `orm:"size(255)" json:"address"` // 地址 + PayMethod int `orm:"size(255)" json:"address"` // 支付方式1-余额支付,2-直接支付,3-微信提现,4-支付宝提现 } func (v *Order) TableUnique() [][]string { diff --git a/business/q_bida/q_bida_server.go b/business/q_bida/q_bida_server.go index 313e7116f..7cbc303c3 100644 --- a/business/q_bida/q_bida_server.go +++ b/business/q_bida/q_bida_server.go @@ -65,12 +65,6 @@ func CreateWayOrder(ctx *jxcontext.Context, param *model.MakeOrderParamReq, user return err } - // 创建三方订单 - //otherId, err := createOtherOrder(param) - //if err != nil { - // return err - //} - // 第三方数据创建成功,则创建本地数据 vendorOrder := &model.UserVendorOrder{ UserId: userId, @@ -139,6 +133,7 @@ func CreateWayOrder(ctx *jxcontext.Context, param *model.MakeOrderParamReq, user CityCode: 0, DistrictCode: 0, Address: "", + PayMethod: 0, } if err := dao.CreateEntity(db, orderPayStatus); err != nil { dao.Rollback(db, tdb) @@ -221,5 +216,42 @@ func QueryUserOrderList(userId string, expressType, orderStatus int, pageNum, pa // CreateOrder2QBiDa 订单回调成功,且为运费支付时使用该接口 func CreateOrder2QBiDa(orderId string) { // 加载订单 + order := &model.UserVendorOrder{} + sql := `SELECT * FROM user_vendor_order WHERE local_way_bill = ? ` + if err := dao.GetRow(dao.GetDB(), order, sql, []interface{}{orderId}...); err != nil { + return + } + + // 创建QBIDA订单 + otherId, err := createOtherOrder(&bida.MakeOrderReq{ + PromiseTimeType: order.PromiseTimeType, + DeliveryType: order.DeliveryType, + Goods: order.Goods, + GuaranteeValueAmount: order.GuaranteeValueAmount, + Weight: order.Weight, + Length: order.Length, + Height: order.Height, + Width: order.Width, + OrderSendTime: order.OrderSendTime, + PackageNum: order.PackageNum, + Remark: order.Remark, + ThirdPlatform: order.ThirdPlatform, + Type: order.Type, + Img: order.Img, + // + //ReceiveAddress: order.ReceiveAddressID, + //ReceiveName: "", + //ReceivePhone: "", + //SenderAddress: "", + //SenderName: "", + //SenderPhone: "", + + }) + // 获取发货地址以及送货地址 + + if err != nil { + return err + } + order.OrderStatus = model.PayStatusYes + 3 // 支付成功 } diff --git a/business/q_bida/q_bida_server_utils.go b/business/q_bida/q_bida_server_utils.go index d92abaa7a..b3c14f055 100644 --- a/business/q_bida/q_bida_server_utils.go +++ b/business/q_bida/q_bida_server_utils.go @@ -34,28 +34,7 @@ func checkWayFeeIsTrue(param *model.MakeOrderParamReq) error { } // 创建QBiDa订单 -func createOtherOrder(param *model.MakeOrderParamReq) (string, error) { +func createOtherOrder(param *bida.MakeOrderReq) (string, error) { // 创建三方订单 - return api.QBiDaAPI.CreateOrder(&bida.MakeOrderReq{ - PromiseTimeType: param.PromiseTimeType, - DeliveryType: param.DeliveryType, - Goods: param.Goods, - GuaranteeValueAmount: param.GuaranteeValueAmount, - Weight: param.Weight, - Length: param.Length, - Height: param.Height, - Width: param.Width, - OrderSendTime: param.OrderSendTime, - PackageNum: param.PackageNum, - ReceiveAddress: param.ReceiveAddress, - ReceiveName: param.ReceiveName, - ReceivePhone: param.ReceivePhone, - Remark: param.Remark, - SenderAddress: param.SenderAddress, - SenderName: param.SenderName, - SenderPhone: param.SenderPhone, - ThirdPlatform: param.ThirdPlatform, - Type: param.Type, - Img: param.Img, - }) + return api.QBiDaAPI.CreateOrder(param) }