Skip to content

Commit

Permalink
fix(generator): ApiTpl request/response params 初始化长度错误
Browse files Browse the repository at this point in the history
  • Loading branch information
bububa committed Jul 1, 2021
1 parent 55304f5 commit 1f0c980
Show file tree
Hide file tree
Showing 34 changed files with 213 additions and 166 deletions.
Binary file modified bin/downloader
Binary file not shown.
Binary file modified bin/generator
Binary file not shown.
2 changes: 1 addition & 1 deletion doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package opentaobao

const (
GitVersion = "v1.1.5"
GitCommit = "360f2c05"
GitCommit = "5b02287b"
GitDate = "<no value>"
GitBuiltBy = "unknown"
)
18 changes: 10 additions & 8 deletions metadata/apidoc.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,30 +66,32 @@ func (d ApiDoc) ApiTpl() ApiTpl {
ResponseKey: fmt.Sprintf("%s_response", strings.TrimPrefix(snakeName, "taobao_")),
ChineseName: d.ChineseName,
Desc: clearDesc(d.Description, false),
RequestParams: make([]TplParam, len(d.RequestParams)),
ResponseParams: make([]TplParam, len(d.ResponseParams)),
RequestParams: make([]TplParam, 0, len(d.RequestParams)),
ResponseParams: make([]TplParam, 0, len(d.ResponseParams)),
}
reqParamMp := make(map[string]struct{}, len(d.RequestParams))
for idx, p := range d.RequestParams {
for _, p := range d.RequestParams {
if _, found := reqParamMp[p.Name]; found {
continue
}
reqParamMp[p.Name] = struct{}{}
tpl.RequestParams[idx] = p.TplParam(tpl.Name)
if !tpl.IsMultipart && tpl.RequestParams[idx].IsMultipart() {
param := p.TplParam(tpl.Name)
tpl.RequestParams = append(tpl.RequestParams, param)
if !tpl.IsMultipart && param.IsMultipart() {
tpl.IsMultipart = true
}
}
respParamMp := make(map[string]struct{}, len(d.ResponseParams))
for idx, p := range d.ResponseParams {
for _, p := range d.ResponseParams {
if _, found := respParamMp[p.Name]; found {
continue
}
respParamMp[p.Name] = struct{}{}
tpl.ResponseParams[idx] = p.TplParam(tpl.Name)
if tpl.ResponseParams[idx].Name == "RequestId" {
param := p.TplParam(tpl.Name)
if param.Name == "RequestId" {
tpl.HasRequestId = true
}
tpl.ResponseParams = append(tpl.ResponseParams, param)
}
return tpl
}
Expand Down
3 changes: 3 additions & 0 deletions model/alihouse/EbbasItemDto.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
package alihouse
import (
"github.com/bububa/opentaobao/model"
)

// EbbasItemDto
type EbbasItemDto struct {
Expand Down
3 changes: 3 additions & 0 deletions model/alitripmerchant/HotelContentDto.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
package alitripmerchant
import (
"github.com/bububa/opentaobao/model"
)

// HotelContentDto
type HotelContentDto struct {
Expand Down
3 changes: 3 additions & 0 deletions model/alitripmerchant/HotelDetailInfoDto.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
package alitripmerchant
import (
"github.com/bububa/opentaobao/model"
)

// HotelDetailInfoDto
type HotelDetailInfoDto struct {
Expand Down
2 changes: 0 additions & 2 deletions model/alsc/AlibabaAlscCrmCardBindcustomerResponse.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,4 @@ type AlibabaAlscCrmCardBindcustomerResponse struct {
RequestId string `json:"request_id,omitempty" xml:"request_id,omitempty"`
// 接口结果
Result *CommonResult `json:"result,omitempty" xml:"result,omitempty"`
//
`json:",omitempty" xml:",omitempty"`
}
58 changes: 52 additions & 6 deletions model/axintrade/AxinFundDTO.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,55 @@
package axintrade

// AxinFundDTO
type AxinFundDTO struct {
// 有效资金单列表
FundList []AxinFundDto `json:"fund_list,omitempty" xml:"fund_list>axin_fund_dto,omitempty"`
// 已支付总金额
TotalPayedAmount int64 `json:"total_payed_amount,omitempty" xml:"total_payed_amount,omitempty"`
// AxinFundDto
type AxinFundDto struct {
// 支付宝交易号
AlipayOrderId string `json:"alipay_order_id,omitempty" xml:"alipay_order_id,omitempty"`
// 支付宝外部商户号
AlipayOuterId string `json:"alipay_outer_id,omitempty" xml:"alipay_outer_id,omitempty"`
// 扩展属性
Attributes string `json:"attributes,omitempty" xml:"attributes,omitempty"`
// 主键
Id int64 `json:"id,omitempty" xml:"id,omitempty"`
// 订单ID
OuterOrderId string `json:"outer_order_id,omitempty" xml:"outer_order_id,omitempty"`
// 付款金额总额
PayFee int64 `json:"pay_fee,omitempty" xml:"pay_fee,omitempty"`
// 正向资金单ID,仅在逆向资金单上使用
PayFundId int64 `json:"pay_fund_id,omitempty" xml:"pay_fund_id,omitempty"`
// 支付订单号(即tp订单号或支付宝流水号)
PayOrderId string `json:"pay_order_id,omitempty" xml:"pay_order_id,omitempty"`
// 付款时间
PayTime string `json:"pay_time,omitempty" xml:"pay_time,omitempty"`
// 付款方式
PayType int64 `json:"pay_type,omitempty" xml:"pay_type,omitempty"`
// 支付方账号
PayerAccount string `json:"payer_account,omitempty" xml:"payer_account,omitempty"`
// 支付方账号类型
PayerAccountType int64 `json:"payer_account_type,omitempty" xml:"payer_account_type,omitempty"`
// 付款方账号id
PayerAlipayId string `json:"payer_alipay_id,omitempty" xml:"payer_alipay_id,omitempty"`
// 支付方昵称
PayerNick string `json:"payer_nick,omitempty" xml:"payer_nick,omitempty"`
// 支付方淘宝ID
PayerTid int64 `json:"payer_tid,omitempty" xml:"payer_tid,omitempty"`
// 收款方账号
ReceiverAccount string `json:"receiver_account,omitempty" xml:"receiver_account,omitempty"`
// 收款方账号类型
ReceiverAccountType int64 `json:"receiver_account_type,omitempty" xml:"receiver_account_type,omitempty"`
// 收款方账号id
ReceiverAlipayId string `json:"receiver_alipay_id,omitempty" xml:"receiver_alipay_id,omitempty"`
// 收款方昵称
ReceiverNick string `json:"receiver_nick,omitempty" xml:"receiver_nick,omitempty"`
// 收款方淘宝ID
ReceiverTid int64 `json:"receiver_tid,omitempty" xml:"receiver_tid,omitempty"`
// 请求版本号
ReqVersion string `json:"req_version,omitempty" xml:"req_version,omitempty"`
// 二级商户smid
Smid string `json:"smid,omitempty" xml:"smid,omitempty"`
// 资金单状态
Status int64 `json:"status,omitempty" xml:"status,omitempty"`
// 付款来源
TradeSource int64 `json:"trade_source,omitempty" xml:"trade_source,omitempty"`
// 交易方式
TradeType int64 `json:"trade_type,omitempty" xml:"trade_type,omitempty"`
}
8 changes: 4 additions & 4 deletions model/baichuan/ASODeviceInfoDO.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package baichuan

// ASODeviceInfoDO
type ASODeviceInfoDO struct {
// idfa
Idfa string `json:"idfa,omitempty" xml:"idfa,omitempty"`
// AsoDeviceInfoDo
type AsoDeviceInfoDo struct {
// imei
Imei string `json:"imei,omitempty" xml:"imei,omitempty"`
// imsi
Imsi string `json:"imsi,omitempty" xml:"imsi,omitempty"`
// idfa
Idfa string `json:"idfa,omitempty" xml:"idfa,omitempty"`
}
3 changes: 3 additions & 0 deletions model/baichuan/IsvItemSubDo.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
package baichuan
import (
"github.com/bububa/opentaobao/model"
)

// IsvItemSubDo
type IsvItemSubDo struct {
Expand Down
3 changes: 3 additions & 0 deletions model/btrip/HotelDto.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
package btrip
import (
"github.com/bububa/opentaobao/model"
)

// HotelDto
type HotelDto struct {
Expand Down
8 changes: 4 additions & 4 deletions model/btrip/OpenUserAffiliateDO.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package btrip

// OpenUserAffiliateDO
type OpenUserAffiliateDO struct {
// 乘车人ID
// OpenUserAffiliateDo
type OpenUserAffiliateDo struct {
// 出行人ID
UserId string `json:"user_id,omitempty" xml:"user_id,omitempty"`
// 乘车人名称
// 出行人名称
UserName string `json:"user_name,omitempty" xml:"user_name,omitempty"`
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,4 @@ type AlibabaAlihealthDrugKytUpstorebillfileResponse struct {
MsgInfo string `json:"msg_info,omitempty" xml:"msg_info,omitempty"`
// 返回接口
ResponseSuccess bool `json:"response_success,omitempty" xml:"response_success,omitempty"`
//
`json:",omitempty" xml:",omitempty"`
//
`json:",omitempty" xml:",omitempty"`
//
`json:",omitempty" xml:",omitempty"`
//
`json:",omitempty" xml:",omitempty"`
}
38 changes: 22 additions & 16 deletions model/drugtrace/CodeRelationDto.go
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
package drugtrace

// CodeRelationDTO
type CodeRelationDTO struct {
// 追溯码;查询的码
Code string `json:"code,omitempty" xml:"code,omitempty"`
// 父码
ParentCode string `json:"parent_code,omitempty" xml:"parent_code,omitempty"`
// 码级别
CodeLevel string `json:"code_level,omitempty" xml:"code_level,omitempty"`
// 包装级别
CodePackLevel string `json:"code_pack_level,omitempty" xml:"code_pack_level,omitempty"`
// 装箱数量;小盒码,返回1;中包码,返回实际小盒数量;大箱码,返回实际小盒数量
BoxAmount int64 `json:"box_amount,omitempty" xml:"box_amount,omitempty"`
// 大箱或中包状态;若扫描的是小盒码,直接返回正常; 0-正常;1-拼箱;2-零箱;3-即拼箱又零箱
BoxStatus int64 `json:"box_status,omitempty" xml:"box_status,omitempty"`
// 码状态
Status string `json:"status,omitempty" xml:"status,omitempty"`
// CodeRelationDto
type CodeRelationDto struct {
// 激活信息
CodeActiveInfoDto *CodeActiveInfoDto `json:"code_active_info_dto,omitempty" xml:"code_active_info_dto,omitempty"`
// 码关联关系
CodeRelationList []CodeInfo `json:"code_relation_list,omitempty" xml:"code_relation_list>code_info,omitempty"`
// 是否是最小包装
IsSmallest string `json:"is_smallest,omitempty" xml:"is_smallest,omitempty"`
// 药品包装信息
PkgInfoDto *PkgInfoDto `json:"pkg_info_dto,omitempty" xml:"pkg_info_dto,omitempty"`
// 药品基础信息
BaseInfosDto *BaseInfosDto `json:"base_infos_dto,omitempty" xml:"base_infos_dto,omitempty"`
// 生产信息
ProduceInfoList []ProduceInfoDto `json:"produce_info_list,omitempty" xml:"produce_info_list>produce_info_dto,omitempty"`
// 激活信息
CodeActiveInfoDTO *CodeActiveInfoDto `json:"code_active_info_d_t_o,omitempty" xml:"code_active_info_d_t_o,omitempty"`
// 药品包装信息
PkgInfoDTO *PkgInfoDto `json:"pkg_info_d_t_o,omitempty" xml:"pkg_info_d_t_o,omitempty"`
// 药品基础信息
BaseInfosDTO *BaseInfosDto `json:"base_infos_d_t_o,omitempty" xml:"base_infos_d_t_o,omitempty"`
// errorCodeContent
ErrorCodeContent string `json:"error_code_content,omitempty" xml:"error_code_content,omitempty"`
}
14 changes: 6 additions & 8 deletions model/einvoice/BillItemDO.go
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package einvoice

// BillItemDo
type BillItemDo struct {
// BillItemDO
type BillItemDO struct {
// 价税合计
Amount string `json:"amount,omitempty" xml:"amount,omitempty"`
// 商品名称
ItemName string `json:"item_name,omitempty" xml:"item_name,omitempty"`
// 商品数量
Quantity string `json:"quantity,omitempty" xml:"quantity,omitempty"`
// 价税合计,小数点后2两位
Amount string `json:"amount,omitempty" xml:"amount,omitempty"`
// 规格型号,可选
Specification string `json:"specification,omitempty" xml:"specification,omitempty"`
// 商品单位
Unit string `json:"unit,omitempty" xml:"unit,omitempty"`
// 商品名称
ItemName string `json:"item_name,omitempty" xml:"item_name,omitempty"`
// 1 折扣行 2被折扣行 0普通行
RowType int64 `json:"row_type,omitempty" xml:"row_type,omitempty"`
}
18 changes: 7 additions & 11 deletions model/feedflow/AdgroupDTo.go
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
package feedflow

// AdgroupDto
type AdgroupDto struct {
// 单元名称
AdgroupName string `json:"adgroup_name,omitempty" xml:"adgroup_name,omitempty"`
// 资源类位表
AdzoneList []AdzoneBindDto `json:"adzone_list,omitempty" xml:"adzone_list>adzone_bind_dto,omitempty"`
// 计划id
CampaignId int64 `json:"campaign_id,omitempty" xml:"campaign_id,omitempty"`
// 定向人群
CrowdList []CrowdDto `json:"crowd_list,omitempty" xml:"crowd_list>crowd_dto,omitempty"`
// 智能调价
// AdgroupDTo
type AdgroupDTo struct {
// 智能出价信息
IntelligentBid *IntelligentBidDto `json:"intelligent_bid,omitempty" xml:"intelligent_bid,omitempty"`
// 商品id
ItemId int64 `json:"item_id,omitempty" xml:"item_id,omitempty"`
// 单元id
AdgroupId int64 `json:"adgroup_id,omitempty" xml:"adgroup_id,omitempty"`
// 单元名称
AdgroupName string `json:"adgroup_name,omitempty" xml:"adgroup_name,omitempty"`
// 计划ID
CampaignId int64 `json:"campaign_id,omitempty" xml:"campaign_id,omitempty"`
// 状态
Status string `json:"status,omitempty" xml:"status,omitempty"`
}
6 changes: 3 additions & 3 deletions model/feedflow/LaunchPeriodDto.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package feedflow

// LaunchPeriodDto
type LaunchPeriodDto struct {
// 列表
// LaunchPeriodDTO
type LaunchPeriodDTO struct {
// 时间
TimeSpanList []TimeSpanDto `json:"time_span_list,omitempty" xml:"time_span_list>time_span_dto,omitempty"`
}
3 changes: 3 additions & 0 deletions model/fundplatform/FundAccountResponse.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
package fundplatform
import (
"github.com/bububa/opentaobao/model"
)

// FundAccountResponse
type FundAccountResponse struct {
Expand Down
3 changes: 3 additions & 0 deletions model/hotel/RoomTypeInfo.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
package hotel
import (
"github.com/bububa/opentaobao/model"
)

// RoomTypeInfo
type RoomTypeInfo struct {
Expand Down
8 changes: 5 additions & 3 deletions model/koubeimall/MallDto.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package koubeimall

// MallDto
type MallDto struct {
// MallDTO
type MallDTO struct {
// 商圈LOGO
MallLogo string `json:"mall_logo,omitempty" xml:"mall_logo,omitempty"`
// 商圈名称
Expand All @@ -12,7 +12,7 @@ type MallDto struct {
MallCover string `json:"mall_cover,omitempty" xml:"mall_cover,omitempty"`
// 商圈ID
MallId string `json:"mall_id,omitempty" xml:"mall_id,omitempty"`
// 地理位置信息
// 地理位置信息模型
DistrictInfo *DistrictInfo `json:"district_info,omitempty" xml:"district_info,omitempty"`
// 商圈主页小程序URL,根据入参参数display_channel信息,获取对应端小程序URL,默认支付宝小程序链接
MallHomePageUrl string `json:"mall_home_page_url,omitempty" xml:"mall_home_page_url,omitempty"`
Expand All @@ -22,4 +22,6 @@ type MallDto struct {
CategoryName string `json:"category_name,omitempty" xml:"category_name,omitempty"`
// 商圈标签,多个标签用英文","分隔符
MallLabel string `json:"mall_label,omitempty" xml:"mall_label,omitempty"`
// 距离
Distance string `json:"distance,omitempty" xml:"distance,omitempty"`
}
3 changes: 3 additions & 0 deletions model/maitix/LockTicketSubOrderSeatDto.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
package maitix
import (
"github.com/bububa/opentaobao/model"
)

// LockTicketSubOrderSeatDto
type LockTicketSubOrderSeatDto struct {
Expand Down
12 changes: 6 additions & 6 deletions model/maitix/VenueDTO.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package maitix

// VenueDto
type VenueDto struct {
// VenueDTO
type VenueDTO struct {
// 场馆id
Id int64 `json:"id,omitempty" xml:"id,omitempty"`
// 纬度
Lat string `json:"lat,omitempty" xml:"lat,omitempty"`
// 经度
Lng string `json:"lng,omitempty" xml:"lng,omitempty"`
// 场馆名称
Name string `json:"name,omitempty" xml:"name,omitempty"`
// 经度
Lng string `json:"lng,omitempty" xml:"lng,omitempty"`
// 纬度
Lat string `json:"lat,omitempty" xml:"lat,omitempty"`
// 场馆地址
VenueAddress string `json:"venue_address,omitempty" xml:"venue_address,omitempty"`
}
3 changes: 3 additions & 0 deletions model/miniappopen/DistributionOrderOpenBizDto.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
package miniappopen
import (
"github.com/bububa/opentaobao/model"
)

// DistributionOrderOpenBizDto
type DistributionOrderOpenBizDto struct {
Expand Down
2 changes: 0 additions & 2 deletions model/nazca/AlibabaInfodeptLassenCasestatisticsGetResponse.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,4 @@ type AlibabaInfodeptLassenCasestatisticsGetResponse struct {
RequestId string `json:"request_id,omitempty" xml:"request_id,omitempty"`
// result
Result string `json:"result,omitempty" xml:"result,omitempty"`
//
`json:",omitempty" xml:",omitempty"`
}

0 comments on commit 1f0c980

Please sign in to comment.