Merge branch 'zq'

zhangqian

2023-08-16 156d873f4878d62bac8b898b587636f3db8f77da

Merge branch 'zq'

 docs/docs.go

@@ -12773,12 +12773,13 @@
                    "description": "问题描述",
                    "type": "string"
                },
                "product": {
                    "$ref": "#/definitions/model.Product"
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "productId": {
                    "description": "产品id",
                    "type": "integer"
                "productTypeName": {
                    "description": "产品分类名称",
                    "type": "string"
                },
                "realTime": {
                    "description": "实际处理时间",
@@ -14473,9 +14474,13 @@
                    "description": "问题描述",
                    "type": "string"
                },
                "productId": {
                    "description": "产品id",
                    "type": "integer"
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "productTypeName": {
                    "description": "产品分类名称",
                    "type": "string"
                },
                "realTime": {
                    "description": "实际处理时间",
@@ -15582,6 +15587,10 @@
        },
        "request.SalesRefund": {
            "type": "object",
            "required": [
                "sourceId",
                "sourceType"
            ],
            "properties": {
                "bankAccountId": {
                    "description": "账户id",
@@ -15620,7 +15629,7 @@
                    "type": "integer"
                },
                "sourceType": {
                    "description": "来源类型（1销售明细单2服务合同3销售发票4收款计划5出库单）",
                    "description": "来源类型（1销售退款单）",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.RefundSourceType"
@@ -17728,9 +17737,13 @@
                    "description": "问题描述",
                    "type": "string"
                },
                "productId": {
                    "description": "产品id",
                    "type": "integer"
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "productTypeName": {
                    "description": "产品分类名称",
                    "type": "string"
                },
                "realTime": {
                    "description": "实际处理时间",

 docs/swagger.json

@@ -12761,12 +12761,13 @@
                    "description": "问题描述",
                    "type": "string"
                },
                "product": {
                    "$ref": "#/definitions/model.Product"
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "productId": {
                    "description": "产品id",
                    "type": "integer"
                "productTypeName": {
                    "description": "产品分类名称",
                    "type": "string"
                },
                "realTime": {
                    "description": "实际处理时间",
@@ -14461,9 +14462,13 @@
                    "description": "问题描述",
                    "type": "string"
                },
                "productId": {
                    "description": "产品id",
                    "type": "integer"
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "productTypeName": {
                    "description": "产品分类名称",
                    "type": "string"
                },
                "realTime": {
                    "description": "实际处理时间",
@@ -15570,6 +15575,10 @@
        },
        "request.SalesRefund": {
            "type": "object",
            "required": [
                "sourceId",
                "sourceType"
            ],
            "properties": {
                "bankAccountId": {
                    "description": "账户id",
@@ -15608,7 +15617,7 @@
                    "type": "integer"
                },
                "sourceType": {
                    "description": "来源类型（1销售明细单2服务合同3销售发票4收款计划5出库单）",
                    "description": "来源类型（1销售退款单）",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.RefundSourceType"
@@ -17716,9 +17725,13 @@
                    "description": "问题描述",
                    "type": "string"
                },
                "productId": {
                    "description": "产品id",
                    "type": "integer"
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "productTypeName": {
                    "description": "产品分类名称",
                    "type": "string"
                },
                "realTime": {
                    "description": "实际处理时间",

 docs/swagger.yaml

@@ -1806,11 +1806,12 @@
      problemDesc:
        description: 问题描述
        type: string
      product:
        $ref: '#/definitions/model.Product'
      productId:
        description: 产品id
        type: integer
      productName:
        description: 产品名称
        type: string
      productTypeName:
        description: 产品分类名称
        type: string
      realTime:
        description: 实际处理时间
        type: string
@@ -2954,9 +2955,12 @@
      problemDesc:
        description: 问题描述
        type: string
      productId:
        description: 产品id
        type: integer
      productName:
        description: 产品名称
        type: string
      productTypeName:
        description: 产品分类名称
        type: string
      realTime:
        description: 实际处理时间
        type: string
@@ -3763,7 +3767,10 @@
      sourceType:
        allOf:
        - $ref: '#/definitions/constvar.RefundSourceType'
        description: 来源类型（1销售明细单2服务合同3销售发票4收款计划5出库单）
        description: 来源类型（1销售退款单）
    required:
    - sourceId
    - sourceType
    type: object
  request.SalesReturn:
    properties:
@@ -5180,9 +5187,12 @@
      problemDesc:
        description: 问题描述
        type: string
      productId:
        description: 产品id
        type: integer
      productName:
        description: 产品名称
        type: string
      productTypeName:
        description: 产品分类名称
        type: string
      realTime:
        description: 实际处理时间
        type: string

 model/request/serviceOrder.go

@@ -10,7 +10,8 @@
    ServiceContractId    int     `gorm:"service_contract_id" json:"serviceContractId"`                                                           // 合同id
    SalesDetailsId       int     `gorm:"sales_details_id" json:"salesDetailsId"`                                                                 // 销售订单id
    Subject              string  `gorm:"subject" json:"subject"`                                                                                 // 主题
    ProductId            int     `gorm:"product_id" json:"productId"`                                                                            // 产品id
    ProductTypeName      string  `json:"productTypeName"`                                                                                        // 产品分类名称
    ProductName          string  `json:"productName"`                                                                                            // 产品名称
    ServiceTypeId        int     `gorm:"service_type_id" json:"serviceTypeId"`                                                                   // 服务方式id
    ServiceManId         int     `gorm:"service_man_id" json:"serviceManId"`                                                                     // 服务人员
    ContactId            int     `gorm:"linkman_id" json:"contactId"`                                                                            // 联系人id

 model/serviceOrder.go

@@ -21,10 +21,10 @@
        ServiceContract      ServiceContract    `gorm:"foreignKey:ServiceContractId"`
        SalesDetailsId       int                `gorm:"column:order_id;type:int;not null;default:0;comment:销售订单id" json:"salesDetailsId"` // 销售明细id
        SalesDetails         SalesDetails       `gorm:"foreignKey:SalesDetailsId"`
        Subject              string             `gorm:"column:subject;type:varchar(255);not null;default:'';comment:主题" json:"subject"` // 主题
        ProductId            int                `gorm:"column:product_id;type:int;not null;default:0;comment:产品id" json:"productId"`    // 产品id
        Product              Product            `gorm:"foreignKey:ProductId"`
        ServiceTypeId        int                `gorm:"column:service_type_id;type:int;not null;default:0;comment:服务方式id" json:"serviceTypeId"` // 服务方式id
        Subject              string             `gorm:"column:subject;type:varchar(255);not null;default:'';comment:主题" json:"subject"`                       // 主题
        ProductTypeName      string             `gorm:"column:product_type_name;type:varchar(255);not null;default:'';comment:产品分类名称" json:"productTypeName"` // 产品分类名称
        ProductName          string             `gorm:"column:product_name;type:varchar(255);not null;default:'';comment:产品名称" json:"productName"`            // 产品名称
        ServiceTypeId        int                `gorm:"column:service_type_id;type:int;not null;default:0;comment:服务方式id" json:"serviceTypeId"`               // 服务方式id
        ServiceType          ServiceType        `gorm:"foreignKey:ServiceTypeId"`
        ServiceManId         int                `gorm:"column:service_man_id;type:int;not null;default:0;comment:服务人员" json:"serviceManId"` // 服务人员
        ContactId            int                `gorm:"linkman_id" json:"contactId"`                                                        // 联系人id