diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index a3b39d992..468e556aa 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -688,6 +688,28 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64 var addressList []*dao.UserDeliveryAddressEx if userID == "" { addressList, _, err = dao.QueryUserDeliveryAddress(db, addressID, nil, 0, 0) + } else if addressID == 464 { // 默认的地址ID,此种类型的订单为到店消费 + addressList = append(addressList, &dao.UserDeliveryAddressEx{ + UserDeliveryAddress: model.UserDeliveryAddress{ + UserID: ctx.GetUserID(), + Tag: "门店地址", + ConsigneeName: storeDetail.Name, + ConsigneeMobile: storeDetail.Tel1, + Address: storeDetail.Address, + DetailAddress: storeDetail.Address, + Lng: jxutils.IntCoordinate2Standard(storeDetail.Lng), + Lat: jxutils.IntCoordinate2Standard(storeDetail.Lat), + AutoAddress: storeDetail.Address, + CityCode: storeDetail.CityCode, + DistrictCode: storeDetail.DistrictCode, + Remark: "", + IsDefault: 1, + }, + UserName: ctx.GetUserName(), + CityName: storeDetail.CityName, + DistrictName: storeDetail.DistrictName, + ParentCode: 0, + }) } else { addressList, _, err = dao.QueryUserDeliveryAddress(db, addressID, nil, 0, 0) } @@ -1170,6 +1192,9 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd OrderType: jxOrder.OrderType, VendorOrderID2: jxOrder.OrderID2, } + orderSeq, _ := dao.GetVendorOrderNumber(dao.GetDB(), model.VendorIDJX, order.VendorStoreID) + order.OrderSeq = orderSeq + 1 + if len(couponIDs) > 0 { strCounponIDs := []string{} for _, v := range couponIDs {