diff --git a/bin/downloader b/bin/downloader index 0c531b5f21..4477e405fd 100755 Binary files a/bin/downloader and b/bin/downloader differ diff --git a/bin/generator b/bin/generator index 3c4d954d05..0b6738bb18 100755 Binary files a/bin/generator and b/bin/generator differ diff --git a/doc.go b/doc.go index e654d1cd91..23ba7357c6 100644 --- a/doc.go +++ b/doc.go @@ -3,7 +3,7 @@ package opentaobao const ( GitVersion = "v1.1.5" - GitCommit = "360f2c05" + GitCommit = "5b02287b" GitDate = "" GitBuiltBy = "unknown" ) diff --git a/metadata/apidoc.go b/metadata/apidoc.go index 827f6e32af..467da89686 100644 --- a/metadata/apidoc.go +++ b/metadata/apidoc.go @@ -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 } diff --git a/model/alihouse/EbbasItemDto.go b/model/alihouse/EbbasItemDto.go index 21d06a3aac..8b4a77bcc9 100644 --- a/model/alihouse/EbbasItemDto.go +++ b/model/alihouse/EbbasItemDto.go @@ -1,4 +1,7 @@ package alihouse +import ( + "github.com/bububa/opentaobao/model" +) // EbbasItemDto type EbbasItemDto struct { diff --git a/model/alitripmerchant/HotelContentDto.go b/model/alitripmerchant/HotelContentDto.go index a57aea3dac..4131fefc1f 100644 --- a/model/alitripmerchant/HotelContentDto.go +++ b/model/alitripmerchant/HotelContentDto.go @@ -1,4 +1,7 @@ package alitripmerchant +import ( + "github.com/bububa/opentaobao/model" +) // HotelContentDto type HotelContentDto struct { diff --git a/model/alitripmerchant/HotelDetailInfoDto.go b/model/alitripmerchant/HotelDetailInfoDto.go index a32525ba9a..c4717bee0d 100644 --- a/model/alitripmerchant/HotelDetailInfoDto.go +++ b/model/alitripmerchant/HotelDetailInfoDto.go @@ -1,4 +1,7 @@ package alitripmerchant +import ( + "github.com/bububa/opentaobao/model" +) // HotelDetailInfoDto type HotelDetailInfoDto struct { diff --git a/model/alsc/AlibabaAlscCrmCardBindcustomerResponse.go b/model/alsc/AlibabaAlscCrmCardBindcustomerResponse.go index 513a8c2d50..594537d5cc 100644 --- a/model/alsc/AlibabaAlscCrmCardBindcustomerResponse.go +++ b/model/alsc/AlibabaAlscCrmCardBindcustomerResponse.go @@ -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"` } diff --git a/model/axintrade/AxinFundDTO.go b/model/axintrade/AxinFundDTO.go index c9bf489839..a5b73c72b9 100644 --- a/model/axintrade/AxinFundDTO.go +++ b/model/axintrade/AxinFundDTO.go @@ -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"` } diff --git a/model/baichuan/ASODeviceInfoDO.go b/model/baichuan/ASODeviceInfoDO.go index 6e1268f1f2..ba5645d76f 100644 --- a/model/baichuan/ASODeviceInfoDO.go +++ b/model/baichuan/ASODeviceInfoDO.go @@ -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"` } diff --git a/model/baichuan/IsvItemSubDo.go b/model/baichuan/IsvItemSubDo.go index e5712abb8c..cbc83cba2d 100644 --- a/model/baichuan/IsvItemSubDo.go +++ b/model/baichuan/IsvItemSubDo.go @@ -1,4 +1,7 @@ package baichuan +import ( + "github.com/bububa/opentaobao/model" +) // IsvItemSubDo type IsvItemSubDo struct { diff --git a/model/btrip/HotelDto.go b/model/btrip/HotelDto.go index 4a2f8ff5b3..6e6e7b61a3 100644 --- a/model/btrip/HotelDto.go +++ b/model/btrip/HotelDto.go @@ -1,4 +1,7 @@ package btrip +import ( + "github.com/bububa/opentaobao/model" +) // HotelDto type HotelDto struct { diff --git a/model/btrip/OpenUserAffiliateDO.go b/model/btrip/OpenUserAffiliateDO.go index dadcb30a4b..a1ca37936c 100644 --- a/model/btrip/OpenUserAffiliateDO.go +++ b/model/btrip/OpenUserAffiliateDO.go @@ -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"` } diff --git a/model/drugtrace/AlibabaAlihealthDrugKytUpstorebillfileResponse.go b/model/drugtrace/AlibabaAlihealthDrugKytUpstorebillfileResponse.go index c143138e00..152a267711 100644 --- a/model/drugtrace/AlibabaAlihealthDrugKytUpstorebillfileResponse.go +++ b/model/drugtrace/AlibabaAlihealthDrugKytUpstorebillfileResponse.go @@ -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"` } diff --git a/model/drugtrace/CodeRelationDto.go b/model/drugtrace/CodeRelationDto.go index 17f90ff3c6..fb664f37d7 100644 --- a/model/drugtrace/CodeRelationDto.go +++ b/model/drugtrace/CodeRelationDto.go @@ -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"` } diff --git a/model/einvoice/BillItemDO.go b/model/einvoice/BillItemDO.go index 8438670476..ca14759bdf 100644 --- a/model/einvoice/BillItemDO.go +++ b/model/einvoice/BillItemDO.go @@ -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"` } diff --git a/model/feedflow/AdgroupDTo.go b/model/feedflow/AdgroupDTo.go index 5ec5e74576..5a86b2f1af 100644 --- a/model/feedflow/AdgroupDTo.go +++ b/model/feedflow/AdgroupDTo.go @@ -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"` } diff --git a/model/feedflow/LaunchPeriodDto.go b/model/feedflow/LaunchPeriodDto.go index 6b3472e3b2..e05ae49610 100644 --- a/model/feedflow/LaunchPeriodDto.go +++ b/model/feedflow/LaunchPeriodDto.go @@ -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"` } diff --git a/model/fundplatform/FundAccountResponse.go b/model/fundplatform/FundAccountResponse.go index 80945bdcb4..aadc17faef 100644 --- a/model/fundplatform/FundAccountResponse.go +++ b/model/fundplatform/FundAccountResponse.go @@ -1,4 +1,7 @@ package fundplatform +import ( + "github.com/bububa/opentaobao/model" +) // FundAccountResponse type FundAccountResponse struct { diff --git a/model/hotel/RoomTypeInfo.go b/model/hotel/RoomTypeInfo.go index 698b61930c..28d8fe755b 100644 --- a/model/hotel/RoomTypeInfo.go +++ b/model/hotel/RoomTypeInfo.go @@ -1,4 +1,7 @@ package hotel +import ( + "github.com/bububa/opentaobao/model" +) // RoomTypeInfo type RoomTypeInfo struct { diff --git a/model/koubeimall/MallDto.go b/model/koubeimall/MallDto.go index ca1ecfaf04..647580c869 100644 --- a/model/koubeimall/MallDto.go +++ b/model/koubeimall/MallDto.go @@ -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"` // 商圈名称 @@ -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"` @@ -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"` } diff --git a/model/maitix/LockTicketSubOrderSeatDto.go b/model/maitix/LockTicketSubOrderSeatDto.go index 22f89eeb30..80b28f211a 100644 --- a/model/maitix/LockTicketSubOrderSeatDto.go +++ b/model/maitix/LockTicketSubOrderSeatDto.go @@ -1,4 +1,7 @@ package maitix +import ( + "github.com/bububa/opentaobao/model" +) // LockTicketSubOrderSeatDto type LockTicketSubOrderSeatDto struct { diff --git a/model/maitix/VenueDTO.go b/model/maitix/VenueDTO.go index 06f9c87cae..66439f9dc7 100644 --- a/model/maitix/VenueDTO.go +++ b/model/maitix/VenueDTO.go @@ -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"` } diff --git a/model/miniappopen/DistributionOrderOpenBizDto.go b/model/miniappopen/DistributionOrderOpenBizDto.go index bc6a27f4ca..9cb5f12d9b 100644 --- a/model/miniappopen/DistributionOrderOpenBizDto.go +++ b/model/miniappopen/DistributionOrderOpenBizDto.go @@ -1,4 +1,7 @@ package miniappopen +import ( + "github.com/bububa/opentaobao/model" +) // DistributionOrderOpenBizDto type DistributionOrderOpenBizDto struct { diff --git a/model/nazca/AlibabaInfodeptLassenCasestatisticsGetResponse.go b/model/nazca/AlibabaInfodeptLassenCasestatisticsGetResponse.go index 3b1170c787..64ef6f77d8 100644 --- a/model/nazca/AlibabaInfodeptLassenCasestatisticsGetResponse.go +++ b/model/nazca/AlibabaInfodeptLassenCasestatisticsGetResponse.go @@ -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"` } diff --git a/model/nlife/RetailSkuTopDO.go b/model/nlife/RetailSkuTopDO.go index 5dfc63bffb..07409a01e9 100644 --- a/model/nlife/RetailSkuTopDO.go +++ b/model/nlife/RetailSkuTopDO.go @@ -1,35 +1,37 @@ package nlife -// RetailSkuTopDO -type RetailSkuTopDO struct { - // outerId - OuterId string `json:"outer_id,omitempty" xml:"outer_id,omitempty"` - // skuId - SkuId int64 `json:"sku_id,omitempty" xml:"sku_id,omitempty"` - // barcode - Barcode string `json:"barcode,omitempty" xml:"barcode,omitempty"` - // price +// RetailSkuTopDo +type RetailSkuTopDo struct { + // 上次修改时间 + Modified string `json:"modified,omitempty" xml:"modified,omitempty"` + // created + Created string `json:"created,omitempty" xml:"created,omitempty"` + // 淘宝上的skuId + TaobaoSkuId string `json:"taobao_sku_id,omitempty" xml:"taobao_sku_id,omitempty"` + // 淘宝上的itemId + TaobaoItemId string `json:"taobao_item_id,omitempty" xml:"taobao_item_id,omitempty"` + // sku主图URL + PicUrl string `json:"pic_url,omitempty" xml:"pic_url,omitempty"` + // sku价格 Price string `json:"price,omitempty" xml:"price,omitempty"` - // sku属性,多个属性以分号分隔 - Properties string `json:"properties,omitempty" xml:"properties,omitempty"` // sku库存 Quantity int64 `json:"quantity,omitempty" xml:"quantity,omitempty"` - // sku属性名称,多个属性以分号分隔 + // sku属性名称 PropertiesName string `json:"properties_name,omitempty" xml:"properties_name,omitempty"` - // 修改时间 - Modified string `json:"modified,omitempty" xml:"modified,omitempty"` - // 创建时间 - Created string `json:"created,omitempty" xml:"created,omitempty"` - // sku的图片信息 - PicUrl string `json:"pic_url,omitempty" xml:"pic_url,omitempty"` - // taobaoItemId - TaobaoItemId string `json:"taobao_item_id,omitempty" xml:"taobao_item_id,omitempty"` - // taobaoSkuId - TaobaoSkuId string `json:"taobao_sku_id,omitempty" xml:"taobao_sku_id,omitempty"` + // sku属性 + Properties string `json:"properties,omitempty" xml:"properties,omitempty"` + // barcode + Barcode string `json:"barcode,omitempty" xml:"barcode,omitempty"` + // skuId + SkuId int64 `json:"sku_id,omitempty" xml:"sku_id,omitempty"` + // 外部商家的编码 + OuterId string `json:"outer_id,omitempty" xml:"outer_id,omitempty"` // sku的挂牌价-单位元,保留2位小数 TagPrice string `json:"tag_price,omitempty" xml:"tag_price,omitempty"` - // sku的真实商品 + // skuRefId SkuRefId int64 `json:"sku_ref_id,omitempty" xml:"sku_ref_id,omitempty"` // 网直供库存 OnlineQuantity int64 `json:"online_quantity,omitempty" xml:"online_quantity,omitempty"` + // 自用编码 + CustomCode string `json:"custom_code,omitempty" xml:"custom_code,omitempty"` } diff --git a/model/product/TaobaoItemPriceUpdateRequest.go b/model/product/TaobaoItemPriceUpdateRequest.go index 30469840dd..378718bbc4 100644 --- a/model/product/TaobaoItemPriceUpdateRequest.go +++ b/model/product/TaobaoItemPriceUpdateRequest.go @@ -44,8 +44,6 @@ type TaobaoItemPriceUpdateRequest struct { _increment float64 // 商品图片。类型:JPG,GIF;最大长度:500k _image []*model.File - // - _ // 商品新旧程度。可选值:new(全新),unused(闲置),second(二手)。 _stuffStatus string // 商品的积分返点比例。如:5 表示返点比例0.5%. 注意:返点比例必须是>0的整数,而且最大是90,即为9%.B商家在发布非虚拟商品时,返点必须是 5的倍数,即0.5%的倍数。其它是1的倍数,即0.1%的倍数。无名良品商家发布商品时,复用该字段记录积分宝返点比例,返点必须是对应类目的返点步长的整数倍,默认是5,即0.5%。注意此时该字段值依旧必须是>0的整数,注意此时该字段值依旧必须是>0的整数,最高值不超过500,即50% @@ -316,18 +314,6 @@ func (r *TaobaoItemPriceUpdateRequest) SetImage(_image []*model.File) error { func (r TaobaoItemPriceUpdateRequest) GetImage() []*model.File { return r._image } -// Setter -// -func (r *TaobaoItemPriceUpdateRequest) Set(_ ) error { - r._ = _ - r.Set("", _) - return nil -} - -// Getter -func (r TaobaoItemPriceUpdateRequest) Get() { - return r._ -} // StuffStatus Setter // 商品新旧程度。可选值:new(全新),unused(闲置),second(二手)。 func (r *TaobaoItemPriceUpdateRequest) SetStuffStatus(_stuffStatus string) error { diff --git a/model/qimen/TaobaoQimenStorecategoryGetResponse.go b/model/qimen/TaobaoQimenStorecategoryGetResponse.go index 1fe7b6e171..9d16322a42 100644 --- a/model/qimen/TaobaoQimenStorecategoryGetResponse.go +++ b/model/qimen/TaobaoQimenStorecategoryGetResponse.go @@ -30,12 +30,4 @@ type TaobaoQimenStorecategoryGetResponse struct { QimenCode string `json:"qimen_code,omitempty" xml:"qimen_code,omitempty"` // 类目json字符串 StoreCategory string `json:"store_category,omitempty" xml:"store_category,omitempty"` - // - `json:",omitempty" xml:",omitempty"` - // - `json:",omitempty" xml:",omitempty"` - // - `json:",omitempty" xml:",omitempty"` - // - `json:",omitempty" xml:",omitempty"` } diff --git a/model/security/AlibabaSecurityJaqRpCloudRphitResponse.go b/model/security/AlibabaSecurityJaqRpCloudRphitResponse.go index 560380372f..fcffe6b2b6 100644 --- a/model/security/AlibabaSecurityJaqRpCloudRphitResponse.go +++ b/model/security/AlibabaSecurityJaqRpCloudRphitResponse.go @@ -24,6 +24,4 @@ type AlibabaSecurityJaqRpCloudRphitResponse struct { RequestId string `json:"request_id,omitempty" xml:"request_id,omitempty"` // result Data string `json:"data,omitempty" xml:"data,omitempty"` - // - `json:",omitempty" xml:",omitempty"` } diff --git a/model/servicecenter/OfnPreRedPacketActionDto.go b/model/servicecenter/OfnPreRedPacketActionDto.go index e953a2e941..4abbfa0f07 100644 --- a/model/servicecenter/OfnPreRedPacketActionDto.go +++ b/model/servicecenter/OfnPreRedPacketActionDto.go @@ -1,17 +1,17 @@ package servicecenter -// OfnPreRedPacketActionDto -type OfnPreRedPacketActionDto struct { - // 主键 - Id int64 `json:"id,omitempty" xml:"id,omitempty"` - // 创建时间 - GmtCreate string `json:"gmt_create,omitempty" xml:"gmt_create,omitempty"` - // 修改时间 - GmtModified string `json:"gmt_modified,omitempty" xml:"gmt_modified,omitempty"` - // 操作类型。1=天猫发预付红包;2=天猫发尾款红包;3=天猫扣回红包;4=回收商扣回红包 - ActionType int64 `json:"action_type,omitempty" xml:"action_type,omitempty"` +// OfnPreRedPacketActionDTO +type OfnPreRedPacketActionDTO struct { // 状态。初始化=1,重试中=2,失败=3,成功=4 Status int64 `json:"status,omitempty" xml:"status,omitempty"` + // 操作类型。1=天猫发预付红包;2=天猫发尾款红包;3=天猫扣回红包;4=回收商扣回红包 + ActionType int64 `json:"action_type,omitempty" xml:"action_type,omitempty"` + // 创建时间 + GmtModified string `json:"gmt_modified,omitempty" xml:"gmt_modified,omitempty"` + // 修改时间 + GmtCreate string `json:"gmt_create,omitempty" xml:"gmt_create,omitempty"` + // 主键 + Id int64 `json:"id,omitempty" xml:"id,omitempty"` // 资金池的记录 AfterFundRecordList []OfnPreRedPacketFundRecordDto `json:"after_fund_record_list,omitempty" xml:"after_fund_record_list>ofn_pre_red_packet_fund_record_dto,omitempty"` } diff --git a/model/shop/AlibabaInteractSensorClipbroadResponse.go b/model/shop/AlibabaInteractSensorClipbroadResponse.go index 2b6debe1e0..133c18e839 100644 --- a/model/shop/AlibabaInteractSensorClipbroadResponse.go +++ b/model/shop/AlibabaInteractSensorClipbroadResponse.go @@ -24,6 +24,4 @@ type AlibabaInteractSensorClipbroadResponse struct { RequestId string `json:"request_id,omitempty" xml:"request_id,omitempty"` // 客户端鉴权使用,实际不会发送或接收数据 Unnamed string `json:"unnamed,omitempty" xml:"unnamed,omitempty"` - // - `json:",omitempty" xml:",omitempty"` } diff --git a/model/waybill/CainiaoCloudprintIsvtemplatesGetResponse.go b/model/waybill/CainiaoCloudprintIsvtemplatesGetResponse.go index aa6be35d92..3d6db81f63 100644 --- a/model/waybill/CainiaoCloudprintIsvtemplatesGetResponse.go +++ b/model/waybill/CainiaoCloudprintIsvtemplatesGetResponse.go @@ -24,6 +24,4 @@ type CainiaoCloudprintIsvtemplatesGetResponse struct { RequestId string `json:"request_id,omitempty" xml:"request_id,omitempty"` // result Result *CloudPrintBaseResult `json:"result,omitempty" xml:"result,omitempty"` - // - `json:",omitempty" xml:",omitempty"` } diff --git a/model/wlb/DeliveryOrder.go b/model/wlb/DeliveryOrder.go index 62df8e5a75..4e944ba2f3 100644 --- a/model/wlb/DeliveryOrder.go +++ b/model/wlb/DeliveryOrder.go @@ -1,13 +1,35 @@ package wlb -// Deliveryorder -type Deliveryorder struct { - // 物流单号 - CnOrderCode string `json:"cn_order_code,omitempty" xml:"cn_order_code,omitempty"` - // 仓库编码 - WarehouseCode string `json:"warehouse_code,omitempty" xml:"warehouse_code,omitempty"` - // 创建时间 +// DeliveryOrder +type DeliveryOrder struct { + // 发货单创建时间 CreateTime string `json:"create_time,omitempty" xml:"create_time,omitempty"` - // 订单行 - OrderLines []Orderline `json:"order_lines,omitempty" xml:"order_lines>orderline,omitempty"` + // ERP出库单号,ERP系统内本次出库的唯一标示 + DeliveryOrderCode string `json:"delivery_order_code,omitempty" xml:"delivery_order_code,omitempty"` + // 物流公司编码 + LogisticsCode string `json:"logistics_code,omitempty" xml:"logistics_code,omitempty"` + // 交接入库单号,例如唯品会入库单号或者门店收货单号、商家仓入库单号等 + RelInBoundOrderCode string `json:"rel_in_bound_order_code,omitempty" xml:"rel_in_bound_order_code,omitempty"` + // 发货仓库 + WarehouseCode string `json:"warehouse_code,omitempty" xml:"warehouse_code,omitempty"` + // 单据类型,出库单类型(JYCK=一般交易出库单;HHCK=换货出库单;BFCK=补发出库单;QTCK=其他出库单;TOBCK=TOB出库;BIGTOBCK=大B2B发货) + OrderType string `json:"order_type,omitempty" xml:"order_type,omitempty"` + // 到货渠道类型,VIP=1、门店=2、经销商=3、大润发=4、猫超=5、零售通=6、AE=7、京东=8、亚马逊=9、经销=10、代理=11、商超=12、其他=99 + ArriveChannelType string `json:"arrive_channel_type,omitempty" xml:"arrive_channel_type,omitempty"` + // 物流公司名称 + LogisticsName string `json:"logistics_name,omitempty" xml:"logistics_name,omitempty"` + // 最晚到货时间 + LastArriveDate string `json:"last_arrive_date,omitempty" xml:"last_arrive_date,omitempty"` + // 订单信息 + OrderLine []OrderLine `json:"order_line,omitempty" xml:"order_line>order_line,omitempty"` + // 扩展信息 + ExtendProps string `json:"extend_props,omitempty" xml:"extend_props,omitempty"` + // 收货人信息 + ReceiverInfo *ReceiverInfo `json:"receiver_info,omitempty" xml:"receiver_info,omitempty"` + // 收货时间区间 + SignTime string `json:"sign_time,omitempty" xml:"sign_time,omitempty"` + // 是否自提 + IsSelfLifting string `json:"is_self_lifting,omitempty" xml:"is_self_lifting,omitempty"` + // 配送方式,1=整车直送、2=拼车直送、3=零担、4=快递、5=自提 + TransportMode string `json:"transport_mode,omitempty" xml:"transport_mode,omitempty"` } diff --git a/model/wlb/TaobaoWlbOrderCreateRequest.go b/model/wlb/TaobaoWlbOrderCreateRequest.go index 41d3128992..7307bd4cbb 100644 --- a/model/wlb/TaobaoWlbOrderCreateRequest.go +++ b/model/wlb/TaobaoWlbOrderCreateRequest.go @@ -70,8 +70,6 @@ type TaobaoWlbOrderCreateRequest struct { _attributes string // 备注 _remark string - // - _ } // 初始化TaobaoWlbOrderCreateRequest对象 @@ -430,15 +428,3 @@ func (r *TaobaoWlbOrderCreateRequest) SetRemark(_remark string) error { func (r TaobaoWlbOrderCreateRequest) GetRemark() string { return r._remark } -// Setter -// -func (r *TaobaoWlbOrderCreateRequest) Set(_ ) error { - r._ = _ - r.Set("", _) - return nil -} - -// Getter -func (r TaobaoWlbOrderCreateRequest) Get() { - return r._ -}