Merge remote-tracking branch 'origin/jdshop' into jxact

controllers/cms.go

@@ -139,6 +139,21 @@ func (c *CmsController) GetCoordinateDistrictCode() {
 	})
 }
 
+// @Title 根据坐标得到城市
+// @Description 根据坐标得到城市
+// @Param	token			header		string	true	"认证token"
+// @Param	lng				query		number	true	"经度"
+// @Param	lat				query		number	true	"纬度"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetCoordinateCityInfo [get]
+func (c *CmsController) GetCoordinateCityInfo() {
+	c.callGetCoordinateCityInfo(func(params *tCmsGetCoordinateCityInfoParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = cms.GetCoordinateCityInfo(params.Ctx, params.Lng, params.Lat)
+		return retVal, "", err
+	})
+}
+
 // @Title 得到配置参数
 // @Description 得到配置参数
 // @Param	token			header		string	true	"认证token"

controllers/cms_store.go

@@ -889,7 +889,7 @@ func (c *StoreController) GetStoreAudit() {
 // @Title 门店审核
 // @Description 门店审核
 // @Param	token			header		string	true	"认证token"
-// @Param	payload			fomData		string	true	"json数据，storeaudit对象"
+// @Param	payload			formData	string	true	"json数据，storeaudit对象"
 // @Param	status			formData	int		false	"审核标志，1通过，-1 不通过"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult

controllers/cms_user2.go

@@ -12,6 +12,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils/jsonerr"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
+	"git.rosy.net.cn/jx-callback/business/partner/purchase/jx/localjx"
 	"github.com/astaxie/beego"
 )
 
@@ -533,3 +534,19 @@ func (c *User2Controller) GetUserAgreement() {
 		return retVal, "", err
 	})
 }
+
+// @Title 查询京西商城用户信息
+// @Description 查询京西商城用户信息
+// @Param	token			header	string	true	"认证token"
+// @Param	keyword			query	string	false	"关键字"
+// @Param	offset			query	int		false	"结果起始序号（以0开始，缺省为0）"
+// @Param	pageSize		query	int		false	"结果页大小（缺省为50，-1表示全部）"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetJxShopUsers [get]
+func (c *User2Controller) GetJxShopUsers() {
+	c.callGetJxShopUsers(func(params *tUser2GetJxShopUsersParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = localjx.GetJxShopUsers(params.Ctx, params.Keyword, params.Offset, params.PageSize)
+		return retVal, "", err
+	})
+}

controllers/jx_order.go

@@ -1182,3 +1182,22 @@ func (c *OrderController) RefreshJdsOrderConsigneeInfo() {
 		return retVal, "", err
 	})
 }
+
+// @Title 修改订单信息
+// @Description 修改订单信息
+// @Param	token			header		string	true	"认证token"
+// @Param	vendorOrderID	formData	string	true	"订单号"
+// @Param	vendorID		formData	int		true	"平台ID"
+// @Param	payload			formData	string	true	"json数据,格式为goodsOrder"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /UpdateOrderInfo [put]
+func (c *OrderController) UpdateOrderInfo() {
+	c.callUpdateOrderInfo(func(params *tOrderUpdateOrderInfoParams) (retVal interface{}, errCode string, err error) {
+		payload := make(map[string]interface{})
+		if err = utils.UnmarshalUseNumber([]byte(params.Payload), &payload); err == nil {
+			retVal, err = orderman.UpdateOrderInfo(params.Ctx, params.VendorOrderID, params.VendorID, payload)
+		}
+		return retVal, "", err
+	})
+}