liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

query delivery

Browse Source
This commit is contained in:
苏尹岚
2020-11-03 15:01:26 +08:00
parent 686416521a
commit e1852e32c4
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/cms/job.go
View File

@@ -613,8 +613,8 @@ func SendJdDelivery(ctx *jxcontext.Context, dOrder *model.DeliveryOrder) (errCod
dOrder.PayPrice = 500 + int(float64(200)*math.Ceil(dOrder.Weight-3)) dOrder.PayPrice = 500 + int(float64(200)*math.Ceil(dOrder.Weight-3))
} }
} }
sendDeliveryList, _, err := dao.QueryUserDeliveryAddress(db, int64(dOrder.DeliverySendID), nil, 0, 0) sendDeliveryList, _, err := dao.QueryUserDeliveryAddress(db, int64(dOrder.DeliverySendID), nil, 0, 0, 0)
receiveDeliveryList, _, err := dao.QueryUserDeliveryAddress(db, int64(dOrder.DeliveryReceiveID), nil, 0, 0) receiveDeliveryList, _, err := dao.QueryUserDeliveryAddress(db, int64(dOrder.DeliveryReceiveID), nil, 0, 0, 0)
userBill, err := dao.GetUserBill(db, ctx.GetUserID(), "") userBill, err := dao.GetUserBill(db, ctx.GetUserID(), "")
if err != nil { if err != nil {
return errCode, err return errCode, err

6
business/jxstore/cms/user2.go
View File

@@ -389,7 +389,7 @@ func UpdateMyDeliveryAddress(ctx *jxcontext.Context, addressID int, payload map[
} }
func QueryUserDeliveryAddress(ctx *jxcontext.Context, userIDs []string, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { func QueryUserDeliveryAddress(ctx *jxcontext.Context, userIDs []string, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
addressList, totalCount, err := dao.QueryUserDeliveryAddress(dao.GetDB(), 0, userIDs, offset, pageSize) addressList, totalCount, err := dao.QueryUserDeliveryAddress(dao.GetDB(), 0, userIDs, 0, offset, pageSize)
if err == nil { if err == nil {
pagedInfo = &model.PagedInfo{ pagedInfo = &model.PagedInfo{
TotalCount: totalCount, TotalCount: totalCount,
@@ -399,9 +399,9 @@ func QueryUserDeliveryAddress(ctx *jxcontext.Context, userIDs []string, offset,
return pagedInfo, err return pagedInfo, err
} }
func QueryMyDeliveryAddress(ctx *jxcontext.Context) (addressList []*dao.UserDeliveryAddressEx, err error) { func QueryMyDeliveryAddress(ctx *jxcontext.Context, addType int) (addressList []*dao.UserDeliveryAddressEx, err error) {
_, userID := ctx.GetMobileAndUserID() _, userID := ctx.GetMobileAndUserID()
addressList, _, err = dao.QueryUserDeliveryAddress(dao.GetDB(), 0, []string{userID}, 0, model.UnlimitedPageSize) addressList, _, err = dao.QueryUserDeliveryAddress(dao.GetDB(), 0, []string{userID}, 0, addType, model.UnlimitedPageSize)
return addressList, err return addressList, err
} }

6
business/model/dao/dao_user.go
View File

@@ -120,7 +120,7 @@ func DeleteUsers(db *DaoDB, userIDs []string) (num int64, err error) {
return num, err return num, err
} }
func QueryUserDeliveryAddress(db *DaoDB, addressID int64, userIDs []string, offset, pageSize int) (addressList []*UserDeliveryAddressEx, totalCount int, err error) { func QueryUserDeliveryAddress(db *DaoDB, addressID int64, userIDs []string, addType int, offset, pageSize int) (addressList []*UserDeliveryAddressEx, totalCount int, err error) {
sql := ` sql := `
SELECT SQL_CALC_FOUND_ROWS SELECT SQL_CALC_FOUND_ROWS
t1.*, t1.*,
@@ -146,6 +146,10 @@ func QueryUserDeliveryAddress(db *DaoDB, addressID int64, userIDs []string, offs
sql += " AND t1.user_id IN (" + GenQuestionMarks(len(userIDs)) + ")" sql += " AND t1.user_id IN (" + GenQuestionMarks(len(userIDs)) + ")"
sqlParams = append(sqlParams, userIDs) sqlParams = append(sqlParams, userIDs)
} }
if addType != 0 {
sql += " AND t1.type = ? "
sqlParams = append(sqlParams, addType)
}
offset = jxutils.FormalizePageOffset(offset) offset = jxutils.FormalizePageOffset(offset)
pageSize = jxutils.FormalizePageSize(pageSize) pageSize = jxutils.FormalizePageSize(pageSize)
sql += ` sql += `

3
controllers/user2_controller.go
View File

@@ -162,12 +162,13 @@ func (c *User2Controller) UpdateMyDeliveryAddress() {
// @Title 用户查询自己的配送地址 // @Title 用户查询自己的配送地址
// @Description 用户查询自己的配送地址 // @Description 用户查询自己的配送地址
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param type query int false "地址类型，1是寄件人，2是收货人"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult
// @router /QueryMyDeliveryAddress [get] // @router /QueryMyDeliveryAddress [get]
func (c *User2Controller) QueryMyDeliveryAddress() { func (c *User2Controller) QueryMyDeliveryAddress() {
c.callQueryMyDeliveryAddress(func(params *tUser2QueryMyDeliveryAddressParams) (retVal interface{}, errCode string, err error) { c.callQueryMyDeliveryAddress(func(params *tUser2QueryMyDeliveryAddressParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.QueryMyDeliveryAddress(params.Ctx) retVal, err = cms.QueryMyDeliveryAddress(params.Ctx, params.Type)
return retVal, "", err return retVal, "", err
}) })
} }