From e1852e32c42789d06b2ebc00fb30e2e9bc1d80f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 3 Nov 2020 15:01:26 +0800
Subject: [PATCH] query delivery

---
 business/jxstore/cms/job.go     | 4 ++--
 business/jxstore/cms/user2.go   | 6 +++---
 business/model/dao/dao_user.go  | 6 +++++-
 controllers/user2_controller.go | 3 ++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go
index 8dbaad85b..2d5c3a6b9 100644
--- a/business/jxstore/cms/job.go
+++ b/business/jxstore/cms/job.go
@@ -613,8 +613,8 @@ func SendJdDelivery(ctx *jxcontext.Context, dOrder *model.DeliveryOrder) (errCod
 			dOrder.PayPrice = 500 + int(float64(200)*math.Ceil(dOrder.Weight-3))
 		}
 	}
-	sendDeliveryList, _, err := dao.QueryUserDeliveryAddress(db, int64(dOrder.DeliverySendID), nil, 0, 0)
-	receiveDeliveryList, _, err := dao.QueryUserDeliveryAddress(db, int64(dOrder.DeliveryReceiveID), 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, 0)
 	userBill, err := dao.GetUserBill(db, ctx.GetUserID(), "")
 	if err != nil {
 		return errCode, err
diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index f900c00d8..06c35c1d2 100644
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -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) {
-	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 {
 		pagedInfo = &model.PagedInfo{
 			TotalCount: totalCount,
@@ -399,9 +399,9 @@ func QueryUserDeliveryAddress(ctx *jxcontext.Context, userIDs []string, offset,
 	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()
-	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
 }
 
diff --git a/business/model/dao/dao_user.go b/business/model/dao/dao_user.go
index 1bd66f53a..883472bc7 100644
--- a/business/model/dao/dao_user.go
+++ b/business/model/dao/dao_user.go
@@ -120,7 +120,7 @@ func DeleteUsers(db *DaoDB, userIDs []string) (num int64, err error) {
 	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 := `
 	SELECT SQL_CALC_FOUND_ROWS
 	t1.*,
@@ -146,6 +146,10 @@ func QueryUserDeliveryAddress(db *DaoDB, addressID int64, userIDs []string, offs
 		sql += " AND t1.user_id IN (" + GenQuestionMarks(len(userIDs)) + ")"
 		sqlParams = append(sqlParams, userIDs)
 	}
+	if addType != 0 {
+		sql += " AND t1.type = ? "
+		sqlParams = append(sqlParams, addType)
+	}
 	offset = jxutils.FormalizePageOffset(offset)
 	pageSize = jxutils.FormalizePageSize(pageSize)
 	sql += `
diff --git a/controllers/user2_controller.go b/controllers/user2_controller.go
index 6d5074418..39fd58573 100644
--- a/controllers/user2_controller.go
+++ b/controllers/user2_controller.go
@@ -162,12 +162,13 @@ func (c *User2Controller) UpdateMyDeliveryAddress() {
 // @Title 用户查询自己的配送地址
 // @Description 用户查询自己的配送地址
 // @Param	token			header		string	true	"认证token"
+// @Param	type			query		int		false	"地址类型，1是寄件人，2是收货人"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /QueryMyDeliveryAddress [get]
 func (c *User2Controller) QueryMyDeliveryAddress() {
 	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
 	})
 }