Skip to content

杨树贤 / search_server

Go to a project
Commit 168acc74 by mushishixian
Options

fix

parent 9772887e
Inline Side-by-side
Showing with 102 additions and 33 deletions
protopb/bom/bom.pb.go
...@@ -431,50 +431,84 @@ func (m *LadderPrice) GetPriceAc() float32 { ...@@ -431,50 +431,84 @@ func (m *LadderPrice) GetPriceAc() float32 {
} }
type GoodsModel struct { type GoodsModel struct {
OtherAttrs *OtherAttrs `protobuf:"bytes,1,opt,name=other_attrs,json=otherAttrs,proto3" json:"other_attrs,omitempty"` // @inject_tag: json:"other_attrs"
PickType int64 `protobuf:"varint,2,opt,name=pick_type,json=pickType,proto3" json:"pick_type,omitempty"` OtherAttrs *OtherAttrs `protobuf:"bytes,1,opt,name=other_attrs,json=otherAttrs,proto3" json:"other_attrs"`
Barcode string `protobuf:"bytes,3,opt,name=barcode,proto3" json:"barcode,omitempty"` // @inject_tag: json:"pick_type"
GoodsId string `protobuf:"bytes,4,opt,name=goods_id,json=goodsId,proto3" json:"goods_id,omitempty"` PickType int64 `protobuf:"varint,2,opt,name=pick_type,json=pickType,proto3" json:"pick_type"`
// @inject_tag: json:"barcode"
Barcode string `protobuf:"bytes,3,opt,name=barcode,proto3" json:"barcode"`
// @inject_tag: json:"goods_id"
GoodsId string `protobuf:"bytes,4,opt,name=goods_id,json=goodsId,proto3" json:"goods_id"`
// @inject_tag: json:"goods_type
GoodsType int64 `protobuf:"varint,5,opt,name=goods_type,json=goodsType,proto3" json:"goods_type,omitempty"` GoodsType int64 `protobuf:"varint,5,opt,name=goods_type,json=goodsType,proto3" json:"goods_type,omitempty"`
SupplierId int64 `protobuf:"varint,6,opt,name=supplier_id,json=supplierId,proto3" json:"supplier_id,omitempty"` // @inject_tag: json:"supplier_id"
BrandId int64 `protobuf:"varint,7,opt,name=brand_id,json=brandId,proto3" json:"brand_id,omitempty"` SupplierId int64 `protobuf:"varint,6,opt,name=supplier_id,json=supplierId,proto3" json:"supplier_id"`
ClassId1 int64 `protobuf:"varint,8,opt,name=class_id1,json=classId1,proto3" json:"class_id1,omitempty"` // @inject_tag: json:"brand_id"
ClassId2 int64 `protobuf:"varint,9,opt,name=class_id2,json=classId2,proto3" json:"class_id2,omitempty"` BrandId int64 `protobuf:"varint,7,opt,name=brand_id,json=brandId,proto3" json:"brand_id"`
GoodsName string `protobuf:"bytes,10,opt,name=goods_name,json=goodsName,proto3" json:"goods_name,omitempty"` // @inject_tag: json:"class_id1"
Status int64 `protobuf:"varint,11,opt,name=status,proto3" json:"status,omitempty"` ClassId1 int64 `protobuf:"varint,8,opt,name=class_id1,json=classId1,proto3" json:"class_id1"`
Encoded string `protobuf:"bytes,12,opt,name=encoded,proto3" json:"encoded,omitempty"` // @inject_tag: json:"class_id2"
Encap string `protobuf:"bytes,13,opt,name=encap,proto3" json:"encap,omitempty"` ClassId2 int64 `protobuf:"varint,9,opt,name=class_id2,json=classId2,proto3" json:"class_id2"`
Packing int64 `protobuf:"varint,14,opt,name=packing,proto3" json:"packing,omitempty"` // @inject_tag: json:"goods_name"
GoodsUnit int64 `protobuf:"varint,15,opt,name=goods_unit,json=goodsUnit,proto3" json:"goods_unit,omitempty"` GoodsName string `protobuf:"bytes,10,opt,name=goods_name,json=goodsName,proto3" json:"goods_name"`
GoodsImages bool `protobuf:"varint,16,opt,name=goods_images,json=goodsImages,proto3" json:"goods_images,omitempty"` // @inject_tag: json:"status"
Pdf string `protobuf:"bytes,17,opt,name=pdf,proto3" json:"pdf,omitempty"` Status int64 `protobuf:"varint,11,opt,name=status,proto3" json:"status"`
GoodsBrief string `protobuf:"bytes,18,opt,name=goods_brief,json=goodsBrief,proto3" json:"goods_brief,omitempty"` // @inject_tag: json:"encoded"
Moq int64 `protobuf:"varint,19,opt,name=moq,proto3" json:"moq,omitempty"` Encoded string `protobuf:"bytes,12,opt,name=encoded,proto3" json:"encoded"`
Mpq int64 `protobuf:"varint,20,opt,name=mpq,proto3" json:"mpq,omitempty"` // @inject_tag: json:"encap"
Encap string `protobuf:"bytes,13,opt,name=encap,proto3" json:"encap"`
// @inject_tag: json:"packing"
Packing int64 `protobuf:"varint,14,opt,name=packing,proto3" json:"packing"`
// @inject_tag: json:"goods_unit"
GoodsUnit int64 `protobuf:"varint,15,opt,name=goods_unit,json=goodsUnit,proto3" json:"goods_unit"`
// @inject_tag: json:"goods_images"
GoodsImages bool `protobuf:"varint,16,opt,name=goods_images,json=goodsImages,proto3" json:"goods_images"`
// @inject_tag: json:"pdf"
Pdf string `protobuf:"bytes,17,opt,name=pdf,proto3" json:"pdf"`
// @inject_tag: json:"goods_brief"
GoodsBrief string `protobuf:"bytes,18,opt,name=goods_brief,json=goodsBrief,proto3" json:"goods_brief"`
// @inject_tag: json:"moq"
Moq int64 `protobuf:"varint,19,opt,name=moq,proto3" json:"moq"`
// @inject_tag: json:"mpq"
Mpq int64 `protobuf:"varint,20,opt,name=mpq,proto3" json:"mpq"`
// @inject_tag: json:"ladder_price" // @inject_tag: json:"ladder_price"
LadderPrice []*LadderPrice `protobuf:"bytes,21,rep,name=ladder_price,json=ladderPrice,proto3" json:"ladder_price"` LadderPrice []*LadderPrice `protobuf:"bytes,21,rep,name=ladder_price,json=ladderPrice,proto3" json:"ladder_price"`
UpdateTime int64 `protobuf:"varint,22,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"` // @inject_tag: json:"update_time"
SkuName string `protobuf:"bytes,23,opt,name=sku_name,json=skuName,proto3" json:"sku_name,omitempty"` UpdateTime int64 `protobuf:"varint,22,opt,name=update_time,json=updateTime,proto3" json:"update_time"`
Mpl int64 `protobuf:"varint,24,opt,name=mpl,proto3" json:"mpl,omitempty"` // @inject_tag: json:"sku_name"
Stock int64 `protobuf:"varint,25,opt,name=stock,proto3" json:"stock,omitempty"` SkuName string `protobuf:"bytes,23,opt,name=sku_name,json=skuName,proto3" json:"sku_name"`
Attrs string `protobuf:"bytes,26,opt,name=attrs,proto3" json:"attrs,omitempty"` // @inject_tag: json:"mpl"
Cost string `protobuf:"bytes,27,opt,name=cost,proto3" json:"cost,omitempty"` Mpl int64 `protobuf:"varint,24,opt,name=mpl,proto3" json:"mpl"`
NewCost string `protobuf:"bytes,28,opt,name=new_cost,json=newCost,proto3" json:"new_cost,omitempty"` // @inject_tag: json:"stock"
SupplierStock int64 `protobuf:"varint,29,opt,name=supplier_stock,json=supplierStock,proto3" json:"supplier_stock,omitempty"` Stock int64 `protobuf:"varint,25,opt,name=stock,proto3" json:"stock"`
SelfSupplierType int64 `protobuf:"varint,30,opt,name=self_supplier_type,json=selfSupplierType,proto3" json:"self_supplier_type,omitempty"` // @inject_tag: json:"attrs"
Attrs string `protobuf:"bytes,26,opt,name=attrs,proto3" json:"attrs"`
// @inject_tag: json:"cost"
Cost string `protobuf:"bytes,27,opt,name=cost,proto3" json:"cost"`
// @inject_tag: json:"new_cost"
NewCost string `protobuf:"bytes,28,opt,name=new_cost,json=newCost,proto3" json:"new_cost"`
// @inject_tag: json:"supplier_stock"
SupplierStock int64 `protobuf:"varint,29,opt,name=supplier_stock,json=supplierStock,proto3" json:"supplier_stock"`
// @inject_tag: json:"self_supplier_type"
SelfSupplierType int64 `protobuf:"varint,30,opt,name=self_supplier_type,json=selfSupplierType,proto3" json:"self_supplier_type"`
// @inject_tag: json:"cn_delivery_time" // @inject_tag: json:"cn_delivery_time"
CnDeliveryTime string `protobuf:"bytes,31,opt,name=cn_delivery_time,json=cnDeliveryTime,proto3" json:"cn_delivery_time"` CnDeliveryTime string `protobuf:"bytes,31,opt,name=cn_delivery_time,json=cnDeliveryTime,proto3" json:"cn_delivery_time"`
BrandName string `protobuf:"bytes,32,opt,name=brand_name,json=brandName,proto3" json:"brand_name,omitempty"` // @inject_tag: json:"brand_name"
SupplierName string `protobuf:"bytes,33,opt,name=supplier_name,json=supplierName,proto3" json:"supplier_name,omitempty"` BrandName string `protobuf:"bytes,32,opt,name=brand_name,json=brandName,proto3" json:"brand_name"`
// @inject_tag: json:"supplier_name"
SupplierName string `protobuf:"bytes,33,opt,name=supplier_name,json=supplierName,proto3" json:"supplier_name"`
GoodsUnitName string `protobuf:"bytes,34,opt,name=goods_unit_name,json=goodsUnitName,proto3" json:"goods_unit_name,omitempty"` GoodsUnitName string `protobuf:"bytes,34,opt,name=goods_unit_name,json=goodsUnitName,proto3" json:"goods_unit_name,omitempty"`
PackingName string `protobuf:"bytes,35,opt,name=packing_name,json=packingName,proto3" json:"packing_name,omitempty"` PackingName string `protobuf:"bytes,35,opt,name=packing_name,json=packingName,proto3" json:"packing_name,omitempty"`
MpqUnitName string `protobuf:"bytes,36,opt,name=mpq_unit_name,json=mpqUnitName,proto3" json:"mpq_unit_name,omitempty"` MpqUnitName string `protobuf:"bytes,36,opt,name=mpq_unit_name,json=mpqUnitName,proto3" json:"mpq_unit_name,omitempty"`
AcType int64 `protobuf:"varint,37,opt,name=ac_type,json=acType,proto3" json:"ac_type,omitempty"` // @inject_tag: json:"ac_type"
AcType int64 `protobuf:"varint,37,opt,name=ac_type,json=acType,proto3" json:"ac_type"`
AllowCoupon int64 `protobuf:"varint,38,opt,name=allow_coupon,json=allowCoupon,proto3" json:"allow_coupon,omitempty"` AllowCoupon int64 `protobuf:"varint,38,opt,name=allow_coupon,json=allowCoupon,proto3" json:"allow_coupon,omitempty"`
ClassId1Name string `protobuf:"bytes,39,opt,name=class_id1_name,json=classId1Name,proto3" json:"class_id1_name,omitempty"` ClassId1Name string `protobuf:"bytes,39,opt,name=class_id1_name,json=classId1Name,proto3" json:"class_id1_name,omitempty"`
ClassId2Name string `protobuf:"bytes,40,opt,name=class_id2_name,json=classId2Name,proto3" json:"class_id2_name,omitempty"` ClassId2Name string `protobuf:"bytes,40,opt,name=class_id2_name,json=classId2Name,proto3" json:"class_id2_name,omitempty"`
IsBuy int64 `protobuf:"varint,41,opt,name=is_buy,json=isBuy,proto3" json:"is_buy,omitempty"` // @inject_tag: json:"otheis_buyr_attrs"
HkDeliveryType string `protobuf:"bytes,42,opt,name=hk_delivery_type,json=hkDeliveryType,proto3" json:"hk_delivery_type,omitempty"` IsBuy int64 `protobuf:"varint,41,opt,name=is_buy,json=isBuy,proto3" json:"otheis_buyr_attrs"`
// @inject_tag: json:"hk_delivery_type"
HkDeliveryType string `protobuf:"bytes,42,opt,name=hk_delivery_type,json=hkDeliveryType,proto3" json:"hk_delivery_type"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
......
protos/bom.proto
...@@ -68,48 +68,82 @@ message LadderPrice { ...@@ -68,48 +68,82 @@ message LadderPrice {
} }
message GoodsModel { message GoodsModel {
// @inject_tag: json:"other_attrs"
OtherAttrs other_attrs = 1; OtherAttrs other_attrs = 1;
// @inject_tag: json:"pick_type"
int64 pick_type = 2; int64 pick_type = 2;
// @inject_tag: json:"barcode"
string barcode = 3; string barcode = 3;
// @inject_tag: json:"goods_id"
string goods_id = 4; string goods_id = 4;
// @inject_tag: json:"goods_type
int64 goods_type = 5; int64 goods_type = 5;
// @inject_tag: json:"supplier_id"
int64 supplier_id = 6; int64 supplier_id = 6;
// @inject_tag: json:"brand_id"
int64 brand_id = 7; int64 brand_id = 7;
// @inject_tag: json:"class_id1"
int64 class_id1 = 8; int64 class_id1 = 8;
// @inject_tag: json:"class_id2"
int64 class_id2 = 9; int64 class_id2 = 9;
// @inject_tag: json:"goods_name"
string goods_name = 10; string goods_name = 10;
// @inject_tag: json:"status"
int64 status = 11; int64 status = 11;
// @inject_tag: json:"encoded"
string encoded = 12; string encoded = 12;
// @inject_tag: json:"encap"
string encap = 13; string encap = 13;
// @inject_tag: json:"packing"
int64 packing = 14; int64 packing = 14;
// @inject_tag: json:"goods_unit"
int64 goods_unit = 15; int64 goods_unit = 15;
// @inject_tag: json:"goods_images"
bool goods_images = 16; bool goods_images = 16;
// @inject_tag: json:"pdf"
string pdf = 17; string pdf = 17;
// @inject_tag: json:"goods_brief"
string goods_brief = 18; string goods_brief = 18;
// @inject_tag: json:"moq"
int64 moq = 19; int64 moq = 19;
// @inject_tag: json:"mpq"
int64 mpq = 20; int64 mpq = 20;
// @inject_tag: json:"ladder_price" // @inject_tag: json:"ladder_price"
repeated LadderPrice ladder_price = 21; repeated LadderPrice ladder_price = 21;
// @inject_tag: json:"update_time"
int64 update_time = 22; int64 update_time = 22;
// @inject_tag: json:"sku_name"
string sku_name = 23; string sku_name = 23;
// @inject_tag: json:"mpl"
int64 mpl = 24; int64 mpl = 24;
// @inject_tag: json:"stock"
int64 stock = 25; int64 stock = 25;
// @inject_tag: json:"attrs"
string attrs = 26; string attrs = 26;
// @inject_tag: json:"cost"
string cost = 27; string cost = 27;
// @inject_tag: json:"new_cost"
string new_cost = 28; string new_cost = 28;
// @inject_tag: json:"supplier_stock"
int64 supplier_stock = 29; int64 supplier_stock = 29;
// @inject_tag: json:"self_supplier_type"
int64 self_supplier_type = 30; int64 self_supplier_type = 30;
// @inject_tag: json:"cn_delivery_time" // @inject_tag: json:"cn_delivery_time"
string cn_delivery_time = 31; string cn_delivery_time = 31;
// @inject_tag: json:"brand_name"
string brand_name = 32; string brand_name = 32;
// @inject_tag: json:"supplier_name"
string supplier_name = 33; string supplier_name = 33;
string goods_unit_name = 34; string goods_unit_name = 34;
string packing_name = 35; string packing_name = 35;
string mpq_unit_name = 36; string mpq_unit_name = 36;
// @inject_tag: json:"ac_type"
int64 ac_type = 37; int64 ac_type = 37;
int64 allow_coupon = 38; int64 allow_coupon = 38;
string class_id1_name = 39; string class_id1_name = 39;
string class_id2_name = 40; string class_id2_name = 40;
// @inject_tag: json:"otheis_buyr_attrs"
int64 is_buy = 41; int64 is_buy = 41;
// @inject_tag: json:"hk_delivery_type"
string hk_delivery_type = 42; string hk_delivery_type = 42;
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment