Browse Source

update

master
dengbiao 3 months ago
parent
commit
ce6ed2f513
6 changed files with 24 additions and 0 deletions
  1. +9
    -0
      app/admin/hdl/enterprise_manage/hdl_central_kitchen_for_school.go
  2. +3
    -0
      app/admin/hdl/hdl_enterprise.go
  3. +3
    -0
      app/admin/md/md_enterprise_manage.go
  4. +3
    -0
      app/customer/md/md_enterprise.go
  5. +3
    -0
      app/customer/svc/svc_enterprise.go
  6. +3
    -0
      app/db/model/central_kitchen_for_school_with_spec.go

+ 9
- 0
app/admin/hdl/enterprise_manage/hdl_central_kitchen_for_school.go View File

@@ -426,6 +426,9 @@ func SetCentralKitchenForSchoolWithSpecByTeacher(c *gin.Context) {
BreakfastUnitPriceForTeacher: req.BreakfastUnitPriceForTeacher,
LunchUnitPriceForTeacher: req.LunchUnitPriceForTeacher,
DinnerUnitPriceForTeacher: req.DinnerUnitPriceForTeacher,
BreakfastTeacherNotice: req.BreakfastTeacherNotice,
LunchTeacherNotice: req.LunchTeacherNotice,
DinnerTeacherNotice: req.DinnerTeacherNotice,
CreateAt: now.Format("2006-01-02 15:04:05"),
UpdateAt: now.Format("2006-01-02 15:04:05"),
})
@@ -446,6 +449,9 @@ func SetCentralKitchenForSchoolWithSpecByTeacher(c *gin.Context) {
BreakfastUnitPriceForTeacher: req.BreakfastUnitPriceForTeacher,
LunchUnitPriceForTeacher: req.LunchUnitPriceForTeacher,
DinnerUnitPriceForTeacher: req.DinnerUnitPriceForTeacher,
BreakfastTeacherNotice: req.BreakfastTeacherNotice,
LunchTeacherNotice: req.LunchTeacherNotice,
DinnerTeacherNotice: req.DinnerTeacherNotice,
CreateAt: now.Format("2006-01-02 15:04:05"),
UpdateAt: now.Format("2006-01-02 15:04:05"),
})
@@ -917,6 +923,9 @@ func GetBasicCentralKitchenForSchool(c *gin.Context) {
BreakfastUnitPriceForTeacher: "0",
LunchUnitPriceForTeacher: "0",
DinnerUnitPriceForTeacher: "0",
BreakfastTeacherNotice: "",
LunchTeacherNotice: "",
DinnerTeacherNotice: "",
CreateAt: time.Now().Format("2006-01-02 15:04:05"),
UpdateAt: time.Now().Format("2006-01-02 15:04:05"),
}


+ 3
- 0
app/admin/hdl/hdl_enterprise.go View File

@@ -245,6 +245,9 @@ func EnterpriseAdd(c *gin.Context) {
BreakfastUnitPriceForTeacher: "0.00",
LunchUnitPriceForTeacher: "0.00",
DinnerUnitPriceForTeacher: "0.00",
BreakfastTeacherNotice: "",
LunchTeacherNotice: "",
DinnerTeacherNotice: "",
CreateAt: now.Format("2006-01-02 15:04:05"),
UpdateAt: now.Format("2006-01-02 15:04:05"),
})


+ 3
- 0
app/admin/md/md_enterprise_manage.go View File

@@ -151,10 +151,13 @@ type SetCentralKitchenForSchoolWithSpecReq struct {
EnterpriseId int `json:"enterprise_id" binding:"required" label:"企业id"`
BreakfastUnitPrice string `json:"breakfast_unit_price" binding:"required" label:"早餐-单价"`
BreakfastUnitPriceForTeacher string `json:"breakfast_unit_price_for_teacher" binding:"required" label:"教师-早餐-单价"`
BreakfastTeacherNotice string `json:"breakfast_teacher_notice" label:"教师早餐说明"`
LunchUnitPrice string `json:"lunch_unit_price" binding:"required" label:"午餐-单价"`
LunchUnitPriceForTeacher string `json:"lunch_unit_price_for_teacher" binding:"required" label:"教师-午餐-单价"`
LunchTeacherNotice string `json:"lunch_teacher_notice" label:"教师午餐说明"`
DinnerUnitPrice string `json:"dinner_unit_price" binding:"required" label:"晚餐-单价"`
DinnerUnitPriceForTeacher string `json:"dinner_unit_price_for_teacher" binding:"required" label:"教师-晚餐-单价"`
DinnerTeacherNotice string `json:"dinner_teacher_notice" label:"教师早餐说明"`
}

type SetCentralKitchenForSchoolWithSpecByPeriodReq struct {


+ 3
- 0
app/customer/md/md_enterprise.go View File

@@ -30,6 +30,9 @@ type CentralKitchenForSchoolInfoResp struct {
LunchUnitPriceForTeacher string `json:"lunch_unit_price_for_teacher" label:"教师-午餐-单价"`
DinnerUnitPrice string `json:"dinner_unit_price" label:"晚餐-单价"`
DinnerUnitPriceForTeacher string `json:"dinner_unit_price_for_teacher" label:"教师-晚餐-单价"`
BreakfastTeacherNotice string `json:"breakfast_teacher_notice" label:"教师早餐说明"`
LunchTeacherNotice string `json:"lunch_teacher_notice" label:"教师午餐说明"`
DinnerTeacherNotice string `json:"dinner_teacher_notice" label:"教师晚餐说明"`
}

type NursingHomePackageInfoResp struct {


+ 3
- 0
app/customer/svc/svc_enterprise.go View File

@@ -59,6 +59,9 @@ func CentralKitchenForSchoolInfo(enterpriseId int) (err error, resp md.CentralKi
resp.LunchUnitPriceForTeacher = spec.LunchUnitPriceForTeacher
resp.DinnerUnitPrice = spec.DinnerUnitPrice
resp.DinnerUnitPriceForTeacher = spec.DinnerUnitPriceForTeacher
resp.BreakfastTeacherNotice = spec.BreakfastTeacherNotice
resp.LunchTeacherNotice = spec.LunchTeacherNotice
resp.DinnerTeacherNotice = spec.DinnerTeacherNotice
}

//3、查询`central_kitchen_for_school_set`


+ 3
- 0
app/db/model/central_kitchen_for_school_with_spec.go View File

@@ -15,6 +15,9 @@ type CentralKitchenForSchoolWithSpec struct {
BreakfastUnitPriceForTeacher string `json:"breakfast_unit_price_for_teacher" xorm:"not null default 0.00 comment('教师-早餐-单价') DECIMAL(4,2)"`
LunchUnitPriceForTeacher string `json:"lunch_unit_price_for_teacher" xorm:"not null default 0.00 comment('教师-午餐-单价') DECIMAL(4,2)"`
DinnerUnitPriceForTeacher string `json:"dinner_unit_price_for_teacher" xorm:"not null default 0.00 comment('教师-晚餐-单价') DECIMAL(4,2)"`
BreakfastTeacherNotice string `json:"breakfast_teacher_notice" xorm:"not null default 0.00 comment('教师早餐说明') DECIMAL(4,2)"`
LunchTeacherNotice string `json:"lunch_teacher_notice" xorm:"not null default 0.00 comment('教师午餐说明') DECIMAL(4,2)"`
DinnerTeacherNotice string `json:"dinner_teacher_notice" xorm:"not null default 0.00 comment('教师晚餐说明') DECIMAL(4,2)"`
CreateAt string `json:"create_at" xorm:"not null default 'CURRENT_TIMESTAMP' DATETIME"`
UpdateAt string `json:"update_at" xorm:"not null default 'CURRENT_TIMESTAMP' DATETIME"`
}

Loading…
Cancel
Save