更新密码找回uniapp
This commit is contained in:
1 parent
7f9a66da0f
commit
3fdda89833
1304 files changed
+3503
-26132
No files matched your search
@@ -15,7 +15,6 @@ import (
|
||||
"server/pkg/identity"
|
||||
)
|
||||
|
||||
// BackendCrmProductController CRM 产品管理(产品台账/目录)
|
||||
type BackendCrmProductController struct {
|
||||
beego.Controller
|
||||
}
|
||||
@@ -37,7 +36,6 @@ type crmProductPayload struct {
|
||||
Remark string `json:"remark"`
|
||||
}
|
||||
|
||||
// normalizeDevMode 规范软件开发「研发方式」:self=自行研发(默认)/ outsource=外协研发(别人帮我们研发)。
|
||||
func normalizeDevMode(v string) string {
|
||||
if strings.TrimSpace(v) == "outsource" {
|
||||
return "outsource"
|
||||
@@ -45,7 +43,6 @@ func normalizeDevMode(v string) string {
|
||||
return "self"
|
||||
}
|
||||
|
||||
// crmProductItem 项目产品清单中的单行(也用于项目生成时写入产品管理)。
|
||||
type crmProductItem struct {
|
||||
ProductNo string `json:"product_no"`
|
||||
Name string `json:"name"`
|
||||
@@ -59,7 +56,6 @@ type crmProductItem struct {
|
||||
Remark string `json:"remark"`
|
||||
}
|
||||
|
||||
// List GET /backend/crm/product/list
|
||||
func (c *BackendCrmProductController) List() {
|
||||
claims, err := pipelineClaims(&c.Controller)
|
||||
if err != nil {
|
||||
@@ -110,7 +106,6 @@ func (c *BackendCrmProductController) List() {
|
||||
})
|
||||
}
|
||||
|
||||
// Detail GET /backend/crm/product/:id
|
||||
func (c *BackendCrmProductController) Detail() {
|
||||
claims, err := pipelineClaims(&c.Controller)
|
||||
if err != nil {
|
||||
@@ -133,7 +128,6 @@ func (c *BackendCrmProductController) Detail() {
|
||||
pipelineOk(&c.Controller, p)
|
||||
}
|
||||
|
||||
// Create POST /backend/crm/product
|
||||
func (c *BackendCrmProductController) Create() {
|
||||
claims, err := pipelineClaims(&c.Controller)
|
||||
if err != nil {
|
||||
@@ -159,7 +153,6 @@ func (c *BackendCrmProductController) Create() {
|
||||
if lineType != "dev" {
|
||||
lineType = "product"
|
||||
}
|
||||
// 非开发行不保留开发字段,避免残留(如 dev_tree="[]")导致清单调用时被误判为软件开发行
|
||||
devUnitPrice := p.DevUnitPrice
|
||||
devMode := normalizeDevMode(p.DevMode)
|
||||
devTree := string(p.DevTree)
|
||||
@@ -197,7 +190,6 @@ func (c *BackendCrmProductController) Create() {
|
||||
pipelineOk(&c.Controller, map[string]interface{}{"id": id})
|
||||
}
|
||||
|
||||
// Update PUT /backend/crm/product/:id
|
||||
func (c *BackendCrmProductController) Update() {
|
||||
claims, err := pipelineClaims(&c.Controller)
|
||||
if err != nil {
|
||||
@@ -236,7 +228,6 @@ func (c *BackendCrmProductController) Update() {
|
||||
if lineType != "dev" {
|
||||
lineType = "product"
|
||||
}
|
||||
// 非开发行清空开发字段,避免残留导致清单调用时被误判为软件开发行
|
||||
devUnitPrice := p.DevUnitPrice
|
||||
devMode := normalizeDevMode(p.DevMode)
|
||||
devTree := string(p.DevTree)
|
||||
@@ -272,7 +263,6 @@ func (c *BackendCrmProductController) Update() {
|
||||
pipelineOk(&c.Controller, map[string]interface{}{"id": id})
|
||||
}
|
||||
|
||||
// Delete DELETE /backend/crm/product/:id
|
||||
func (c *BackendCrmProductController) Delete() {
|
||||
claims, err := pipelineClaims(&c.Controller)
|
||||
if err != nil {
|
||||
@@ -304,8 +294,6 @@ func (c *BackendCrmProductController) Delete() {
|
||||
pipelineOk(&c.Controller, nil)
|
||||
}
|
||||
|
||||
// SyncFromProject POST /backend/crm/product/sync-from-project
|
||||
// 项目生成(或保存)时,把项目产品清单里的产品参数写入产品管理(按 名称+分类 去重 upsert)。
|
||||
func (c *BackendCrmProductController) SyncFromProject() {
|
||||
claims, err := pipelineClaims(&c.Controller)
|
||||
if err != nil {
|
||||
@@ -335,10 +323,6 @@ func (c *BackendCrmProductController) SyncFromProject() {
|
||||
pipelineOk(&c.Controller, map[string]interface{}{"created": created, "updated": updated})
|
||||
}
|
||||
|
||||
// SyncProjectProducts 把项目产品清单写入产品管理:按 产品名称+分类 在同一租户下去重。
|
||||
// - 已存在:刷新单价/成本/税率/规格/单位/来源项目/备注;
|
||||
// - 不存在:新建产品档案,登记来源项目。
|
||||
// 返回新建数、更新数。
|
||||
func SyncProjectProducts(tenantID string, projectID uint64, projectName string, items []crmProductItem) (created int, updated int, err error) {
|
||||
if len(items) == 0 {
|
||||
return 0, 0, nil
|
||||
@@ -358,7 +342,6 @@ func SyncProjectProducts(tenantID string, projectID uint64, projectName string,
|
||||
Filter("delete_time__isnull", true).
|
||||
OrderBy("-id").Limit(1).One(&exist)
|
||||
if e == nil && exist.ID > 0 {
|
||||
// 已存在:更新参数
|
||||
_, uerr := models.Orm.QueryTable(new(models.TenantCrmProduct)).
|
||||
Filter("id", exist.ID).
|
||||
Update(orm.Params{
|
||||
@@ -380,7 +363,6 @@ func SyncProjectProducts(tenantID string, projectID uint64, projectName string,
|
||||
updated++
|
||||
continue
|
||||
}
|
||||
// 不存在:新建
|
||||
row := models.TenantCrmProduct{
|
||||
TenantID: tenantID,
|
||||
ProductNo: strings.TrimSpace(it.ProductNo),
|
||||
@@ -408,15 +390,6 @@ func SyncProjectProducts(tenantID string, projectID uint64, projectName string,
|
||||
return created, updated, nil
|
||||
}
|
||||
|
||||
// SyncContractProducts 把合同产品清单同步到产品管理(供合同保存时调用):
|
||||
// - 已关联 product_id 或名称命中现有产品:回填 product_id,并将成本单价强制取产品管理
|
||||
// (成本追溯产品管理;销售单价不回写,允许合同溢价);
|
||||
// - 名称未命中(产品管理中不存在):新建产品档案,销售单价/成本单价/规格/单位/分类/税率取自合同行;
|
||||
// 软件开发行(line_type=dev)同样建档,并写入统一人天单价与模块树,使该「开发包」可在产品管理中复用;
|
||||
// - 软件开发行已关联到产品档案时,回写最新模块树与人天单价(价格仍由产品管理主导,不回写);
|
||||
// - projectID 传入时回填为产品档案的「来源项目」。
|
||||
//
|
||||
// 返回(可能已回填 product_id 与成本单价)的清单 JSON,供合同落库。
|
||||
func SyncContractProducts(tenantID, uid string, projectID uint64, projectName string, raw json.RawMessage) (json.RawMessage, error) {
|
||||
var items []map[string]interface{}
|
||||
if len(raw) == 0 || strings.TrimSpace(string(raw)) == "[]" || strings.TrimSpace(string(raw)) == "" {
|
||||
@@ -427,7 +400,6 @@ func SyncContractProducts(tenantID, uid string, projectID uint64, projectName st
|
||||
}
|
||||
now := time.Now()
|
||||
for _, it := range items {
|
||||
// 行类型:成品 product / 软件开发 dev,缺省按成品处理并回填给清单
|
||||
lineType := normalizeLineType(productFieldStr(it["line_type"]))
|
||||
it["line_type"] = lineType
|
||||
|
||||
@@ -435,7 +407,6 @@ func SyncContractProducts(tenantID, uid string, projectID uint64, projectName st
|
||||
if name == "" {
|
||||
continue
|
||||
}
|
||||
// 已关联产品:成本单价强制取产品管理,不回写销售单价
|
||||
if pid := toUint64(it["product_id"]); pid > 0 {
|
||||
var p models.TenantCrmProduct
|
||||
if e := models.Orm.QueryTable(new(models.TenantCrmProduct)).
|
||||
@@ -447,7 +418,6 @@ func SyncContractProducts(tenantID, uid string, projectID uint64, projectName st
|
||||
}
|
||||
continue
|
||||
}
|
||||
// 按名称命中现有产品(未启用也命中,便于回填):需与当前行类型一致,避免成品/开发互相误匹配
|
||||
var exist models.TenantCrmProduct
|
||||
e := models.Orm.QueryTable(new(models.TenantCrmProduct)).
|
||||
Filter("tenant_id", tenantID).Filter("product_name", name).
|
||||
@@ -458,7 +428,6 @@ func SyncContractProducts(tenantID, uid string, projectID uint64, projectName st
|
||||
syncDevTreeToProduct(&exist, it)
|
||||
continue
|
||||
}
|
||||
// 未命中:新建产品档案(成本/单价等取自合同行)
|
||||
row := models.TenantCrmProduct{
|
||||
TenantID: tenantID,
|
||||
ProductNo: genProductNo(tenantID),
|
||||
@@ -476,7 +445,6 @@ func SyncContractProducts(tenantID, uid string, projectID uint64, projectName st
|
||||
CreateTime: now,
|
||||
UpdateTime: now,
|
||||
}
|
||||
// 软件开发行:写入统一人天单价、研发方式与模块树,作为可复用的「开发包」
|
||||
if lineType == "dev" {
|
||||
row.DevUnitPrice = toFloat64(it["dev_unit_price"])
|
||||
row.DevMode = normalizeDevMode(productFieldStr(it["dev_mode"]))
|
||||
@@ -492,7 +460,6 @@ func SyncContractProducts(tenantID, uid string, projectID uint64, projectName st
|
||||
row.Unit = "项"
|
||||
}
|
||||
}
|
||||
// 回填来源项目(仅项目合同有,无头合同为空)
|
||||
if projectID > 0 {
|
||||
pid := projectID
|
||||
row.ProjectID = &pid
|
||||
@@ -511,7 +478,6 @@ func SyncContractProducts(tenantID, uid string, projectID uint64, projectName st
|
||||
return json.RawMessage(out), nil
|
||||
}
|
||||
|
||||
// normalizeLineType 规范化行类型:空值按成品处理。
|
||||
func normalizeLineType(v string) string {
|
||||
if strings.TrimSpace(v) == "" {
|
||||
return "product"
|
||||
@@ -519,7 +485,6 @@ func normalizeLineType(v string) string {
|
||||
return strings.TrimSpace(v)
|
||||
}
|
||||
|
||||
// productFieldStr 安全取清单字段的字符串值:nil 时返回空串,避免 fmt 输出 "<nil>"。
|
||||
func productFieldStr(v interface{}) string {
|
||||
if v == nil {
|
||||
return ""
|
||||
@@ -527,9 +492,6 @@ func productFieldStr(v interface{}) string {
|
||||
return strings.TrimSpace(fmt.Sprintf("%v", v))
|
||||
}
|
||||
|
||||
// syncDevTreeToProduct 软件开发行引用到产品档案时,回写最新模块树、人天单价与研发方式
|
||||
// (仅在有变化时更新;销售/成本单价不回写,仍由产品管理主导),
|
||||
// 保证后续合同再选该产品能拿到最新的开发包。
|
||||
func syncDevTreeToProduct(p *models.TenantCrmProduct, it map[string]interface{}) {
|
||||
if p == nil || p.ID == 0 || normalizeLineType(p.LineType) != "dev" {
|
||||
return
|
||||
@@ -544,7 +506,6 @@ func syncDevTreeToProduct(p *models.TenantCrmProduct, it map[string]interface{})
|
||||
}
|
||||
newTree := string(b)
|
||||
newUnitPrice := toFloat64(it["dev_unit_price"])
|
||||
// 研发方式:清单行传了值就跟随回写(自行研发 / 外协研发)
|
||||
newMode := p.DevMode
|
||||
if m := productFieldStr(it["dev_mode"]); m != "" {
|
||||
newMode = normalizeDevMode(m)
|
||||
@@ -558,7 +519,6 @@ func syncDevTreeToProduct(p *models.TenantCrmProduct, it map[string]interface{})
|
||||
_, _ = models.Orm.Update(p, "DevTree", "DevUnitPrice", "DevMode")
|
||||
}
|
||||
|
||||
// genProductNo 生成产品编号 P-yyyymmdd-4位序号,并保证本租户内不重复。
|
||||
func genProductNo(tenantID string) string {
|
||||
day := time.Now().Format("20060102")
|
||||
for i := 0; i < 8; i++ {
|
||||
@@ -572,7 +532,6 @@ func genProductNo(tenantID string) string {
|
||||
return fmt.Sprintf("P-%s-%d", day, time.Now().UnixNano()%100000)
|
||||
}
|
||||
|
||||
// toUint64 转为 uint64(依赖同包 toInt64)。
|
||||
func toUint64(v interface{}) uint64 {
|
||||
return uint64(toInt64(v))
|
||||
}
|
||||
Reference in new issue
Block a user