aps/crm.git - Gitblit

parent: 3baea54e | 补丁 | 提交 | show whitespace

Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm

liujiandao

2023-10-16 fe6e307de8fd0a829be6bdd007fbaa994454f4f5

Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm

16个文件已修改

	api/v1/client.go	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	api/v1/contact.go	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	api/v1/contract.go	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	api/v1/followRecord.go	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	api/v1/masterOrder.go	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	api/v1/quotation.go	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	api/v1/saleChance.go	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	api/v1/salesDetails.go	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	api/v1/salesLeads.go	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	api/v1/salesRefund.go	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	api/v1/salesReturn.go	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	api/v1/serviceContract.go	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	api/v1/serviceFollowup.go	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	api/v1/serviceOrder.go	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	api/v1/subOrder.go	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	model/saleChance.go	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 api/v1/client.go

@@ -28,6 +28,13 @@
        return
    }

    if params.MemberId == 0 {
        userInfo := utils.GetUserInfo(c)
        if userInfo.UserType == constvar.UserTypeSub {
            params.MemberId = userInfo.CrmUserId
        }
    }

    errCode, client := checkClientParams(params.Client)
    if errCode != ecode.OK {
        ctx.Fail(errCode)

 api/v1/contact.go

@@ -34,6 +34,13 @@
        return
    }

    if params.MemberId == 0 {
        userInfo := utils.GetUserInfo(c)
        if userInfo.UserType == constvar.UserTypeSub {
            params.MemberId = userInfo.CrmUserId
        }
    }

    errCode = contactService.AddContact(&contact)
    if errCode != ecode.OK {
        ctx.Fail(errCode)

 api/v1/contract.go

@@ -34,6 +34,13 @@
        return
    }

    if contract.MemberId == 0 {
        userInfo := utils.GetUserInfo(c)
        if userInfo.UserType == constvar.UserTypeSub {
            contract.MemberId = userInfo.CrmUserId
        }
    }

    errCode = contractService.AddContract(&contract)
    if errCode != ecode.OK {
        ctx.Fail(errCode)

 api/v1/followRecord.go

@@ -36,6 +36,13 @@
        return
    }

    if followRecord.MemberId == 0 {
        userInfo := utils.GetUserInfo(c)
        if userInfo.UserType == constvar.UserTypeSub {
            followRecord.MemberId = userInfo.CrmUserId
        }
    }

    errCode = followRecordService.AddFollowRecord(followRecord)
    if errCode != ecode.OK {
        ctx.Fail(errCode)

 api/v1/masterOrder.go

@@ -34,6 +34,13 @@
        return
    }

    if masterOrder.MemberId == 0 {
        userInfo := utils.GetUserInfo(c)
        if userInfo.UserType == constvar.UserTypeSub {
            masterOrder.MemberId = userInfo.CrmUserId
        }
    }

    errCode = masterOrderService.AddMasterOrder(&masterOrder)
    if errCode != ecode.OK {
        ctx.Fail(errCode)

 api/v1/quotation.go

@@ -34,6 +34,13 @@
        return
    }

    if quotation.MemberId == 0 {
        userInfo := utils.GetUserInfo(c)
        if userInfo.UserType == constvar.UserTypeSub {
            quotation.MemberId = userInfo.CrmUserId
        }
    }

    errCode = quotationService.AddQuotation(&quotation)
    if errCode != ecode.OK {
        ctx.Fail(errCode)

 api/v1/saleChance.go

@@ -45,6 +45,13 @@
        }
    }

    if saleChance.MemberId == 0 {
        userInfo := utils.GetUserInfo(c)
        if userInfo.UserType == constvar.UserTypeSub {
            saleChance.MemberId = userInfo.CrmUserId
        }
    }

    errCode = saleChanceService.AddSaleChance(&saleChance)
    if errCode != ecode.OK {
        ctx.Fail(errCode)

 api/v1/salesDetails.go

@@ -35,6 +35,13 @@
        return
    }

    if salesDetails.MemberId == 0 {
        userInfo := utils.GetUserInfo(c)
        if userInfo.UserType == constvar.UserTypeSub {
            salesDetails.MemberId = userInfo.CrmUserId
        }
    }

    errCode = salesDetailsService.AddSalesDetails(&salesDetails)
    if errCode != ecode.OK {
        ctx.Fail(errCode)

 api/v1/salesLeads.go

@@ -28,6 +28,13 @@
        return
    }

    if params.MemberId == 0 {
        userInfo := utils.GetUserInfo(c)
        if userInfo.UserType == constvar.UserTypeSub {
            params.MemberId = userInfo.CrmUserId
        }
    }

    errCode, salesLeads := checkSalesLeadsParams(params.SalesLeads)
    if errCode != ecode.OK {
        ctx.Fail(errCode)

 api/v1/salesRefund.go

@@ -36,6 +36,13 @@
        return
    }

    if salesRefund.MemberId == 0 {
        userInfo := utils.GetUserInfo(c)
        if userInfo.UserType == constvar.UserTypeSub {
            salesRefund.MemberId = userInfo.CrmUserId
        }
    }

    errCode = salesRefundService.AddSalesRefund(&salesRefund)
    if errCode != ecode.OK {
        ctx.Fail(errCode)

 api/v1/salesReturn.go

@@ -37,6 +37,13 @@
        return
    }

    if salesReturn.MemberId == 0 {
        userInfo := utils.GetUserInfo(c)
        if userInfo.UserType == constvar.UserTypeSub {
            salesReturn.MemberId = userInfo.CrmUserId
        }
    }

    errCode = salesReturnService.AddSalesReturn(&salesReturn)
    if errCode != ecode.OK {
        ctx.Fail(errCode)

 api/v1/serviceContract.go

@@ -35,6 +35,13 @@
        return
    }

    if params.MemberId == 0 {
        userInfo := utils.GetUserInfo(c)
        if userInfo.UserType == constvar.UserTypeSub {
            params.MemberId = userInfo.CrmUserId
        }
    }

    errCode := serviceContractService.AddServiceContract(serviceContract)
    if errCode != ecode.OK {
        ctx.Fail(errCode)

 api/v1/serviceFollowup.go

@@ -28,6 +28,12 @@
        return
    }

    if params.MemberId == 0 {
        userInfo := utils.GetUserInfo(c)
        if userInfo.UserType == constvar.UserTypeSub {
            params.MemberId = userInfo.CrmUserId
        }
    }
    errCode, serviceFollowup := checkServiceFollowupParams(params.ServiceFollowup)
    if errCode != ecode.OK {
        ctx.Fail(errCode)

 api/v1/serviceOrder.go

@@ -30,6 +30,12 @@
        return
    }

    if params.ServiceManId == 0 {
        userInfo := utils.GetUserInfo(c)
        if userInfo.UserType == constvar.UserTypeSub {
            params.ServiceManId = userInfo.CrmUserId
        }
    }
    serviceOrder := new(model.ServiceOrder)
    if err := structx.AssignTo(params, serviceOrder); err != nil {
        ctx.Fail(ecode.ParamsErr)

 api/v1/subOrder.go

@@ -34,6 +34,13 @@
        return
    }

    if subOrder.MemberId == 0 {
        userInfo := utils.GetUserInfo(c)
        if userInfo.UserType == constvar.UserTypeSub {
            subOrder.MemberId = userInfo.CrmUserId
        }
    }

    errCode = subOrderService.AddSubOrder(&subOrder)
    if errCode != ecode.OK {
        ctx.Fail(errCode)

 model/saleChance.go

@@ -11,6 +11,7 @@
        Name                  string                 `json:"name" gorm:"column:name;type:varchar(255);comment:公司名称"`
        Number                string                 `json:"number" gorm:"column:number;type:varchar(255);comment:销售线索编号"`
        ContactId             int                    `json:"contact_id" gorm:"column:contact_id;type:int(11);comment:联系人ID"`
        Contact               Contact                `json:"contact" gorm:"foreignKey:ContactId;references:Id"`
        ClientId              int                    `json:"client_id" gorm:"column:client_id;type:int(11);comment:客户ID"`
        SalesSourcesId        int                    `json:"sales_sources_id" gorm:"column:sales_sources_id;type:int(11);comment:商机来源ID"`
        SaleTypeId            int                    `json:"sale_type_id" gorm:"column:sale_type_id;type:int(11);comment:商机类型ID"`
@@ -42,7 +43,6 @@
        Threats               string                 `json:"threats" gorm:"column:threats;type:text;comment:竞争威胁"`
        DetailAddress         string                 `json:"detail_address" gorm:"column:detail_address;type:text;comment:详细地址"`
        Remark                string                 `json:"remark" gorm:"column:remark;type:text;comment:备注"`
        Contact               Contact                `json:"contact" gorm:"foreignKey:ContactId;references:Id"`
        Client                Client                 `json:"client" gorm:"foreignKey:ClientId;references:Id"`
        CollectionProjections []CollectionProjection `json:"collection_projections" gorm:"foreignKey:SaleChanceId"`
        SalesSources          SalesSources           `json:"sales_sources"`
@@ -160,7 +160,10 @@
        db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
    }

    err := db.Preload("SaleType").Preload("RegularCustomers").Preload("SalesSources").Preload("Member").Preload("SaleStage").Preload("Possibility").Preload("CollectionProjections").Preload("Client").Preload("Province").Preload("City").Order("id desc").Find(&records).Error
    err := db.Preload("SaleType").Preload("RegularCustomers").Preload("SalesSources").
        Preload("Member").Preload("SaleStage").Preload("Possibility").
        Preload("CollectionProjections").Preload("Client").
        Preload("Province").Preload("City").Preload("Contact").Order("id desc").Find(&records).Error
    return records, total, err
}

			@@ -28,6 +28,13 @@
			return
			}

			if params.MemberId == 0 {
			userInfo := utils.GetUserInfo(c)
			if userInfo.UserType == constvar.UserTypeSub {
			params.MemberId = userInfo.CrmUserId
			}
			}

			errCode, client := checkClientParams(params.Client)
			if errCode != ecode.OK {
			ctx.Fail(errCode)

			@@ -34,6 +34,13 @@
			return
			}

			if params.MemberId == 0 {
			userInfo := utils.GetUserInfo(c)
			if userInfo.UserType == constvar.UserTypeSub {
			params.MemberId = userInfo.CrmUserId
			}
			}

			errCode = contactService.AddContact(&contact)
			if errCode != ecode.OK {
			ctx.Fail(errCode)

			@@ -34,6 +34,13 @@
			return
			}

			if contract.MemberId == 0 {
			userInfo := utils.GetUserInfo(c)
			if userInfo.UserType == constvar.UserTypeSub {
			contract.MemberId = userInfo.CrmUserId
			}
			}

			errCode = contractService.AddContract(&contract)
			if errCode != ecode.OK {
			ctx.Fail(errCode)

			@@ -36,6 +36,13 @@
			return
			}

			if followRecord.MemberId == 0 {
			userInfo := utils.GetUserInfo(c)
			if userInfo.UserType == constvar.UserTypeSub {
			followRecord.MemberId = userInfo.CrmUserId
			}
			}

			errCode = followRecordService.AddFollowRecord(followRecord)
			if errCode != ecode.OK {
			ctx.Fail(errCode)

			@@ -34,6 +34,13 @@
			return
			}

			if masterOrder.MemberId == 0 {
			userInfo := utils.GetUserInfo(c)
			if userInfo.UserType == constvar.UserTypeSub {
			masterOrder.MemberId = userInfo.CrmUserId
			}
			}

			errCode = masterOrderService.AddMasterOrder(&masterOrder)
			if errCode != ecode.OK {
			ctx.Fail(errCode)

			@@ -34,6 +34,13 @@
			return
			}

			if quotation.MemberId == 0 {
			userInfo := utils.GetUserInfo(c)
			if userInfo.UserType == constvar.UserTypeSub {
			quotation.MemberId = userInfo.CrmUserId
			}
			}

			errCode = quotationService.AddQuotation(&quotation)
			if errCode != ecode.OK {
			ctx.Fail(errCode)

			@@ -45,6 +45,13 @@
			}
			}

			if saleChance.MemberId == 0 {
			userInfo := utils.GetUserInfo(c)
			if userInfo.UserType == constvar.UserTypeSub {
			saleChance.MemberId = userInfo.CrmUserId
			}
			}

			errCode = saleChanceService.AddSaleChance(&saleChance)
			if errCode != ecode.OK {
			ctx.Fail(errCode)

			@@ -35,6 +35,13 @@
			return
			}

			if salesDetails.MemberId == 0 {
			userInfo := utils.GetUserInfo(c)
			if userInfo.UserType == constvar.UserTypeSub {
			salesDetails.MemberId = userInfo.CrmUserId
			}
			}

			errCode = salesDetailsService.AddSalesDetails(&salesDetails)
			if errCode != ecode.OK {
			ctx.Fail(errCode)

			@@ -36,6 +36,13 @@
			return
			}

			if salesRefund.MemberId == 0 {
			userInfo := utils.GetUserInfo(c)
			if userInfo.UserType == constvar.UserTypeSub {
			salesRefund.MemberId = userInfo.CrmUserId
			}
			}

			errCode = salesRefundService.AddSalesRefund(&salesRefund)
			if errCode != ecode.OK {
			ctx.Fail(errCode)

			@@ -37,6 +37,13 @@
			return
			}

			if salesReturn.MemberId == 0 {
			userInfo := utils.GetUserInfo(c)
			if userInfo.UserType == constvar.UserTypeSub {
			salesReturn.MemberId = userInfo.CrmUserId
			}
			}

			errCode = salesReturnService.AddSalesReturn(&salesReturn)
			if errCode != ecode.OK {
			ctx.Fail(errCode)

			@@ -28,6 +28,12 @@
			return
			}

			if params.MemberId == 0 {
			userInfo := utils.GetUserInfo(c)
			if userInfo.UserType == constvar.UserTypeSub {
			params.MemberId = userInfo.CrmUserId
			}
			}
			errCode, serviceFollowup := checkServiceFollowupParams(params.ServiceFollowup)
			if errCode != ecode.OK {
			ctx.Fail(errCode)

			@@ -30,6 +30,12 @@
			return
			}

			if params.ServiceManId == 0 {
			userInfo := utils.GetUserInfo(c)
			if userInfo.UserType == constvar.UserTypeSub {
			params.ServiceManId = userInfo.CrmUserId
			}
			}
			serviceOrder := new(model.ServiceOrder)
			if err := structx.AssignTo(params, serviceOrder); err != nil {
			ctx.Fail(ecode.ParamsErr)

			@@ -34,6 +34,13 @@
			return
			}

			if subOrder.MemberId == 0 {
			userInfo := utils.GetUserInfo(c)
			if userInfo.UserType == constvar.UserTypeSub {
			subOrder.MemberId = userInfo.CrmUserId
			}
			}

			errCode = subOrderService.AddSubOrder(&subOrder)
			if errCode != ecode.OK {
			ctx.Fail(errCode)

			@@ -11,6 +11,7 @@
			Name string `json:"name" gorm:"column:name;type:varchar(255);comment:公司名称"`
			Number string `json:"number" gorm:"column:number;type:varchar(255);comment:销售线索编号"`
			ContactId int `json:"contact_id" gorm:"column:contact_id;type:int(11);comment:联系人ID"`
			Contact Contact `json:"contact" gorm:"foreignKey:ContactId;references:Id"`
			ClientId int `json:"client_id" gorm:"column:client_id;type:int(11);comment:客户ID"`
			SalesSourcesId int `json:"sales_sources_id" gorm:"column:sales_sources_id;type:int(11);comment:商机来源ID"`
			SaleTypeId int `json:"sale_type_id" gorm:"column:sale_type_id;type:int(11);comment:商机类型ID"`
			@@ -42,7 +43,6 @@
			Threats string `json:"threats" gorm:"column:threats;type:text;comment:竞争威胁"`
			DetailAddress string `json:"detail_address" gorm:"column:detail_address;type:text;comment:详细地址"`
			Remark string `json:"remark" gorm:"column:remark;type:text;comment:备注"`
			Contact Contact `json:"contact" gorm:"foreignKey:ContactId;references:Id"`
			Client Client `json:"client" gorm:"foreignKey:ClientId;references:Id"`
			CollectionProjections []CollectionProjection `json:"collection_projections" gorm:"foreignKey:SaleChanceId"`
			SalesSources SalesSources `json:"sales_sources"`
			@@ -160,7 +160,10 @@
			db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
			}

			err := db.Preload("SaleType").Preload("RegularCustomers").Preload("SalesSources").Preload("Member").Preload("SaleStage").Preload("Possibility").Preload("CollectionProjections").Preload("Client").Preload("Province").Preload("City").Order("id desc").Find(&records).Error
			err := db.Preload("SaleType").Preload("RegularCustomers").Preload("SalesSources").
			Preload("Member").Preload("SaleStage").Preload("Possibility").
			Preload("CollectionProjections").Preload("Client").
			Preload("Province").Preload("City").Preload("Contact").Order("id desc").Find(&records).Error
			return records, total, err
			}