Merge branch 'master' into fly

wangpengfei

2023-08-10 012da13206f2e4d6a3871b050c71a3b237878424

 model/request/salesDetails.go

@@ -1,31 +1,32 @@
package request

import (
   "aps_crm/constvar"
   "aps_crm/model"
)

type AddSalesDetails struct {
   SalesDetails SalesDetails `json:"salesDetails"`
   SalesDetails
}

type SalesDetails struct {
   ClientId          int             `json:"clientId" gorm:"column:client_id;type:int;comment:客户id"`
   Number            string          `json:"number" gorm:"column:number;type:varchar(255);comment:销售子单号"`
   SaleChanceId      int             `json:"saleChanceId" gorm:"column:sale_chance_id;type:int;comment:销售机会id"`
   SaleType          int             `json:"saleType" gorm:"column:sale_type;type:int;comment:销售类型"`
   SignTime          string          `json:"signTime" gorm:"column:sign_time;type:datetime;comment:签单时间"`
   MemberId          int             `json:"memberId" gorm:"column:member_id;type:int;comment:负责人id"`
   DeliveryDate      string          `json:"deliveryDate" gorm:"column:delivery_date;type:datetime;comment:交货日期"`
   WechatOrderStatus int             `json:"wechatOrderStatus" gorm:"column:wechat_order_status;type:int;comment:微信订单状态"`
   Address           string          `json:"address" gorm:"column:address;type:varchar(255);comment:地址"`
   Phone             string          `json:"phone" gorm:"column:phone;type:varchar(255);comment:电话"`
   Addressee         string          `json:"addressee" gorm:"column:addressee;type:varchar(255);comment:收件人"`
   Conditions        string          `json:"conditions" gorm:"column:conditions;type:text;comment:条件"`
   Remark            string          `json:"remark" gorm:"column:remark;type:text;comment:备注"`
   Products          []model.Product `json:"products" gorm:"many2many:salesDetails_product;"`
   LogisticCompany   string          `json:"logisticCompany" gorm:"column:logistic_company;type:varchar(255);comment:物流公司"`
   LogisticNumber    string          `json:"logisticNumber" gorm:"column:logistic_number;type:varchar(255);comment:物流单号"`
   LogisticCost      float64         `json:"logisticCost" gorm:"column:logistic_cost;type:decimal(10,2);comment:物流费用"`
   ClientId            int             `json:"clientId" gorm:"column:client_id;type:int;comment:客户id"`
   Number              string          `json:"number" gorm:"column:number;type:varchar(255);comment:销售子单号"`
   SaleChanceId        int             `json:"saleChanceId" gorm:"column:sale_chance_id;type:int;comment:销售机会id"`
   SaleType            int             `json:"saleType" gorm:"column:sale_type;type:int;comment:销售类型"`
   SignTime            string          `json:"signTime" gorm:"column:sign_time;type:datetime;comment:签单时间"`
   MemberId            int             `json:"memberId" gorm:"column:member_id;type:int;comment:负责人id"`
   DeliveryDate        string          `json:"deliveryDate" gorm:"column:delivery_date;type:datetime;comment:交货日期"`
   WechatOrderStatusId int             `json:"wechatOrderStatusId" gorm:"column:wechat_order_status_id;type:int;comment:微信订单状态id"`
   Address             string          `json:"address" gorm:"column:address;type:varchar(255);comment:地址"`
   Phone               string          `json:"phone" gorm:"column:phone;type:varchar(255);comment:电话"`
   Addressee           string          `json:"addressee" gorm:"column:addressee;type:varchar(255);comment:收件人"`
   Conditions          string          `json:"conditions" gorm:"column:conditions;type:text;comment:条件"`
   Remark              string          `json:"remark" gorm:"column:remark;type:text;comment:备注"`
   Products            []model.Product `json:"products" gorm:"many2many:sales_details_product;"`
   LogisticCompany     string          `json:"logisticCompany" gorm:"column:logistic_company;type:varchar(255);comment:物流公司"`
   LogisticNumber      string          `json:"logisticNumber" gorm:"column:logistic_number;type:varchar(255);comment:物流单号"`
   LogisticCost        float64         `json:"logisticCost" gorm:"column:logistic_cost;type:decimal(10,2);comment:物流费用"`
}

type UpdateSalesDetails struct {
@@ -35,5 +36,6 @@

type GetSalesDetailsList struct {
   PageInfo
   Keyword string `json:"keyword"`
   KeywordType constvar.SalesDetailsKeywordType `json:"keywordType"`
   Keyword     string                           `json:"keyword"`
}