diff --git a/business/model/user.go b/business/model/user.go index 0e12ab4ba..c9876abeb 100644 --- a/business/model/user.go +++ b/business/model/user.go @@ -119,9 +119,7 @@ type UserPayment struct { type UserDeliveryAddress struct { ModelIDCULD - - UserID string `orm:"size(48);column(user_id)" json:"userID"` // 内部唯一标识 - + UserID string `orm:"size(48);column(user_id)" json:"userID"` // 内部唯一标识 Tag string `orm:"size(32)" json:"tag"` ConsigneeName string `orm:"size(32)" json:"consigneeName"` ConsigneeMobile string `orm:"size(32)" json:"consigneeMobile"` @@ -129,14 +127,12 @@ type UserDeliveryAddress struct { DetailAddress string `orm:"size(255)" json:"detailAddress"` // 门牌号 Lng float64 `orm:"digits(10);decimals(6)" json:"lng"` Lat float64 `orm:"digits(10);decimals(6)" json:"lat"` - - AutoAddress string `orm:"size(255)" json:"autoAddress"` // 这个是通过坐标自动获取的结构化的地址 - CityCode int `orm:"default(0);null" json:"cityCode"` // 根据坐标获得 - DistrictCode int `orm:"default(0);null" json:"districtCode"` // 根据坐标获得 - - Remark string `orm:"type(text)" json:"remark"` - IsDefault int8 `json:"isDefault"` - Type int `json:"type"` //1为寄件人,2为取件人(收货人) + AutoAddress string `orm:"size(255)" json:"autoAddress"` // 这个是通过坐标自动获取的结构化的地址 + CityCode int `orm:"default(0);null" json:"cityCode"` // 根据坐标获得 + DistrictCode int `orm:"default(0);null" json:"districtCode"` // 根据坐标获得 + Remark string `orm:"type(text)" json:"remark"` + IsDefault int8 `json:"isDefault"` + Type int `json:"type"` //1为寄件人,2为取件人(收货人) } func (*UserDeliveryAddress) TableUnique() [][]string { diff --git a/controllers/q_bida.go b/controllers/q_bida.go index 5a87bf7be..4e1d883c0 100644 --- a/controllers/q_bida.go +++ b/controllers/q_bida.go @@ -16,7 +16,7 @@ type QBiDaExpressController struct { // @Param token header string false "管理员token" // @Param promiseTimeType formData int true "快递时效产品" // @Param deliveryType formData int true "产品类型" -// @Param goodsValue formData int true "保价金额" +// @Param goodsValue formData float64 true "保价金额" // @Param receiveAddress formData string true "收件人地址" // @Param sendAddress formData string true "寄件人地址" // @Param type formData int true "快递公司" @@ -48,4 +48,36 @@ func (c *QBiDaExpressController) QueryExpressPrice() { }) } -// 添加收货地址 +// 下单 + +// CreateWayOrder 下单 +// @Title Q必达 +// @Description 下单 +// @Param token header string false "管理员token" +// @Param promiseTimeType formData int true "快递时效产品" +// @Param deliveryType formData int true "产品类型" +// @Param goods formData string true "商品名称" +// @Param guaranteeValueAmount formData float64 true "保价金额" +// @Param weight formData int true "重量kg" +// @Param length formData int true "所有包裹累计长" +// @Param width formData int true "所有包裹累计宽" +// @Param height formData int true "所有包裹累计高" +// @Param orderSendTime formData string true "预约时间" +// @Param packageNum formData int true "包裹数量" +// @Param receiveAddress formData string true "收件人地址" +// @Param receiveName formData string true "收件人姓名" +// @Param receivePhone formData string true "收件人手机号" +// @Param remark formData string false "运单备注" +// @Param senderAddress formData string true "寄件人地址" +// @Param senderName formData string true "寄件人姓名" +// @Param senderPhone formData string true "寄件人手机号" +// @Param thirdPlatform formData int true "第三方平台" +// @Param type formData int true "快递公司" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /CreateWayOrder [post] +func (c *QBiDaExpressController) CreateWayOrder() { + c.callCreateWayOrder(func(params *tExpressCreateWayOrderParams) (interface{}, string, error) { + return nil, "", nil + }) +}