0818AM

models/cases/cases.go

@@ -35,7 +35,7 @@ type CaseInfo struct {
 func (m *CaseDAO) GetCaseList(caseids, casename string, page, pageSize int) ([]CaseInfo, error) {
 	var cases []CaseInfo
 	sql := `select a.*,b.user_name as create_user_name from sys_case a inner join sys_user b on a.create_user = b.user_id
-	 where a.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
+	 where a.status>` + strconv.Itoa(models.STATUS_DEL) + ` and a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
 	if casename != "" {
 		sql = sql + ` and  a.case_name like '%` + casename + `%'`
 	}
@@ -43,7 +43,7 @@ func (m *CaseDAO) GetCaseList(caseids, casename string, page, pageSize int) ([]C
 	sql = sql + " order by create_date desc limit " + strconv.Itoa(page*pageSize) + ", " + strconv.Itoa((page+1)*pageSize)
 
 	// var cases []model.SysCase
-	// dao := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+	// dao := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
 	// if casename != "" {
 	// 	dao = dao.And("case_name like '%" + casename + "%'")
 	// }
@@ -55,7 +55,7 @@ func (m *CaseDAO) GetCaseList(caseids, casename string, page, pageSize int) ([]C
 // GetCaseCount 获取案场数量
 func (m *CaseDAO) GetCaseCount(caseids, casename string) (int, error) {
 	var cases []model.SysCase
-	dao := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+	dao := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
 	if casename != "" {
 		dao = dao.And("case_name like '%" + casename + "%'")
 	}
@@ -66,7 +66,7 @@ func (m *CaseDAO) GetCaseCount(caseids, casename string) (int, error) {
 // GetCaseByID 根据ID获取案场信息
 func (m *CaseDAO) GetCaseByID(caseid string) (*model.SysCase, error) {
 	var cases []model.SysCase
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id=?", caseid).Find(&cases)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id=?", caseid).Find(&cases)
 	if err != nil {
 		return nil, err
 	}

models/cases/caseuser.go

@@ -4,20 +4,21 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"time"
 )
 
 // GetCaseUserByCase 根据案场id获取案场相关人员
 func (m *CaseDAO) GetCaseUserByCase(caseid string) ([]model.SysCaseUser, error) {
 	var caseusers []model.SysCaseUser
-	err := m.db.Where("case_id=?", caseid).And("status=?", models.STATUS_NORMAL).Find(&caseusers)
+	err := m.db.Where("case_id=?", caseid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&caseusers)
 	return caseusers, err
 }
 
 // GetCaseUserByID 根据id获取相关人员
 func (m *CaseDAO) GetCaseUserByID(userid string) (*model.SysCaseUser, error) {
 	var caseusers []model.SysCaseUser
-	err := m.db.Where("case_user_id=?", userid).And("status=?", models.STATUS_NORMAL).Find(&caseusers)
+	err := m.db.Where("case_user_id=?", userid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&caseusers)
 	if err != nil {
 		return nil, err
 	}
@@ -30,7 +31,7 @@ func (m *CaseDAO) GetCaseUserByID(userid string) (*model.SysCaseUser, error) {
 // GetCaseUserByUserType 根据用户类型获取相关人员
 func (m *CaseDAO) GetCaseUserByUserType(caseid, usertype string) ([]model.SysCaseUser, error) {
 	var caseusers []model.SysCaseUser
-	err := m.db.Where("case_id=?", caseid).And("user_type=?", usertype).And("status=?", models.STATUS_NORMAL).Find(&caseusers)
+	err := m.db.Where("case_id=?", caseid).And("user_type=?", usertype).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&caseusers)
 	return caseusers, err
 }
 

models/cases/equipment.go

@@ -4,27 +4,28 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"strings"
 )
 
 // GetEquipmentList 获取体检设备
 func (m *CaseDAO) GetEquipmentList(caseids string, page, pageSize int) ([]model.SysCaseEquipment, error) {
 	var equipments []model.SysCaseEquipment
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Find(&equipments)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Find(&equipments)
 	return equipments, err
 }
 
 // GetEquipmentCount 获取体检设备总数
 func (m *CaseDAO) GetEquipmentCount(caseids string) (int, error) {
 	var caseEquipment []model.SysCaseEquipment
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&caseEquipment)
+	err := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&caseEquipment)
 	return len(caseEquipment), err
 }
 
 // GetCaseEquipmentByID 根据ID获取体检设备
 func (m *CaseDAO) GetCaseEquipmentByID(equipmentid string) (*model.SysCaseEquipment, error) {
 	var caseEquipment []model.SysCaseEquipment
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("spec_id=?", equipmentid).Find(&caseEquipment)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("spec_id=?", equipmentid).Find(&caseEquipment)
 	if err != nil {
 		return nil, err
 	}

models/cases/key.go

@@ -1,3 +1,16 @@
 package cases
 
-//
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"strconv"
+)
+
+// GetKeysByCase 根据案场获取钥匙信息
+func (m *CaseDAO) GetKeysByCase(caseid string, page, pageSize int) ([]model.TaCaseKey, error) {
+	var keys []model.TaCaseKey
+	err := m.db.Where("case_id=?", caseid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&keys)
+	return keys, err
+}
+
+// GetCurrentKey 获取当前钥匙的占用人员

models/cases/tag.go

@@ -12,7 +12,7 @@ import (
 // GetTagCount 获取标签总数
 func (m *CaseDAO) GetTagCount(caseids string) (int, error) {
 	var tags []model.SysTag
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&tags)
+	err := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&tags)
 	return len(tags), err
 }
 
@@ -26,7 +26,7 @@ type TagInfo struct {
 func (m *CaseDAO) GetTagList(caseids string, page int, pageSize int) ([]TagInfo, error) {
 	var tags []TagInfo
 	sql := `select tag.*,c.case_names from sys_tag tag inner join (
-	select b.tag_id,GROUP_CONCAT(a.case_name) case_names from sys_case a inner join sys_tag_case b on a.case_id=b.case_id and a.status= ` + strconv.Itoa(models.STATUS_NORMAL) + `
+	select b.tag_id,GROUP_CONCAT(a.case_name) case_names from sys_case a inner join sys_tag_case b on a.case_id=b.case_id and a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
 	where b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and b.tag_id not in (select tag_id from sys_tag_case where case_id not in ('` +
 		strings.Replace(caseids, ",", "','", -1) + `'))
 	group by b.tag_id ) c on tag.tag_id = c.tag_id`
@@ -101,7 +101,7 @@ func (m *CaseDAO) DelTagCase(tagid string) error {
 
 // SaveTagCase 保存标签对应的案场
 func (m *CaseDAO) SaveTagCase(tagid, caseids string) error {
-	sql := `insert into sys_tag_case(tag_id,case_id) select '` + tagid + `', case_id from sys_case where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and status = ` + strconv.Itoa(models.STATUS_NORMAL)
+	sql := `insert into sys_tag_case(tag_id,case_id) select '` + tagid + `', case_id from sys_case where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and status > ` + strconv.Itoa(models.STATUS_DEL)
 	_, err := m.db.Exec(sql)
 	return err
 }

models/goods/spec.go

@@ -4,27 +4,28 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"strings"
 )
 
 // GetGoodsSpecCount 获取商品规格总数
 func (m *GoodsDAO) GetGoodsSpecCount(caseids string) (int, error) {
 	var goodsSpec []model.TdSpec
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&goodsSpec)
+	err := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&goodsSpec)
 	return len(goodsSpec), err
 }
 
 // GetGoodsSpec 根据案场获取商品规格
 func (m *GoodsDAO) GetGoodsSpec(caseids string, page int, pageSize int) ([]model.TdSpec, error) {
 	var goodsSpec []model.TdSpec
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Find(&goodsSpec)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Find(&goodsSpec)
 	return goodsSpec, err
 }
 
 // GetGoodsSpecByID 根据ID获取商品规格
 func (m *GoodsDAO) GetGoodsSpecByID(specid string) (*model.TdSpec, error) {
 	var goodsSpec []model.TdSpec
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("spec_id=?", specid).Find(&goodsSpec)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("spec_id=?", specid).Find(&goodsSpec)
 	if err != nil {
 		return nil, err
 	}

models/goods/type.go

@@ -4,6 +4,7 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -11,21 +12,21 @@ import (
 // GetGoodsTypeCount 获取商品类型总数
 func (m *GoodsDAO) GetGoodsTypeCount(caseids string) (int, error) {
 	var goodstype []model.TdGoodsType
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&goodstype)
+	err := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&goodstype)
 	return len(goodstype), err
 }
 
 // GetGoodsType 根据案场获取商品类型
 func (m *GoodsDAO) GetGoodsType(caseids string, page int, pageSize int) ([]model.TdGoodsType, error) {
 	var goodstype []model.TdGoodsType
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Desc("create_date").Find(&goodstype)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Desc("create_date").Find(&goodstype)
 	return goodstype, err
 }
 
 // GetGoodsTypeByID 根据ID获取商品类型
 func (m *GoodsDAO) GetGoodsTypeByID(typeid string) (*model.TdGoodsType, error) {
 	var goodstype []model.TdGoodsType
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("type_id=?", typeid).Find(&goodstype)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("type_id=?", typeid).Find(&goodstype)
 	if err != nil {
 		return nil, err
 	}

models/message/cmscase.go

@@ -80,7 +80,7 @@ func (m *MessageDAO) GetCoursesByCmsCase(cmscaseid string) ([]model.TaCourse, er
 // GetCmsCaseImgs 根据项目专题ID获取课程图片
 func (m *MessageDAO) GetCmsCaseImgs(cmscaseid string) ([]model.TaCmsCaseImage, error) {
 	var imgs []model.TaCmsCaseImage
-	err := m.db.Where("cms_case_id=?", cmscaseid).And("status=?", models.STATUS_NORMAL).Find(&imgs)
+	err := m.db.Where("cms_case_id=?", cmscaseid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&imgs)
 	return imgs, err
 }
 
@@ -136,7 +136,7 @@ func (m *MessageDAO) DelCmsCaseCourse(cmscaseid string) error {
 
 // SaveCmsCaseCourse 保存项目对应的课程
 func (m *MessageDAO) SaveCmsCaseCourse(cmscaseid, courseids string) error {
-	sql := `insert into ta_cms_case_course(cms_case_id,course_id) select '` + cmscaseid + `', course_id from ta_course where course_id in ('` + strings.Replace(courseids, ",", "','", -1) + `') and status = ` + strconv.Itoa(models.STATUS_NORMAL)
+	sql := `insert into ta_cms_case_course(cms_case_id,course_id) select '` + cmscaseid + `', course_id from ta_course where course_id in ('` + strings.Replace(courseids, ",", "','", -1) + `') and status > ` + strconv.Itoa(models.STATUS_DEL)
 	_, err := m.db.Exec(sql)
 	return err
 }

models/message/image.go

@@ -4,20 +4,21 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"time"
 )
 
 // GetImgList 获取轮播图列表
 func (m *MessageDAO) GetImgList(orgid string, page int, pageSize int) ([]model.TaCmsImages, error) {
 	var imgs []model.TaCmsImages
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid).Limit(pageSize, page*pageSize).Desc("create_date").Find(&imgs)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).Limit(pageSize, page*pageSize).Desc("create_date").Find(&imgs)
 	return imgs, err
 }
 
 // GetImgListCount 获取轮播图count
 func (m *MessageDAO) GetImgListCount(orgid string) (int, error) {
 	var imgs []model.TaCmsImages
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid).Find(&imgs)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).Find(&imgs)
 	if err != nil {
 		return 0, err
 	}
@@ -27,7 +28,7 @@ func (m *MessageDAO) GetImgListCount(orgid string) (int, error) {
 // GetImgByLocation 根据位置获取轮播图信息
 func (m *MessageDAO) GetImgByLocation(orgid, locationid string) ([]model.TaCmsImages, error) {
 	var imgs []model.TaCmsImages
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid).And("location_id=?", locationid).Asc("sort").Find(&imgs)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).And("location_id=?", locationid).Asc("sort").Find(&imgs)
 	return imgs, err
 }
 
@@ -35,7 +36,7 @@ func (m *MessageDAO) GetImgByLocation(orgid, locationid string) ([]model.TaCmsIm
 func (m *MessageDAO) GetImgByID(imgid string) (*model.TaCmsImages, error) {
 	var imgs []model.TaCmsImages
 
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("image_id=?", imgid).Find(&imgs)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("image_id=?", imgid).Find(&imgs)
 	if err != nil {
 		return nil, err
 	}

models/message/location.go

@@ -4,6 +4,7 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 )
 
 const (
@@ -13,7 +14,7 @@ const (
 // GetLocationList 获取位置字典
 func (m *MessageDAO) GetLocationList(issys, org_id string) ([]model.TdCmsImageLocation, error) {
 	var locations []model.TdCmsImageLocation
-	s := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", org_id)
+	s := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", org_id)
 	if issys != "" {
 		s = s.And("is_sys=?", issys)
 	}
@@ -24,7 +25,7 @@ func (m *MessageDAO) GetLocationList(issys, org_id string) ([]model.TdCmsImageLo
 // GetLocationById 根据ID获取明细
 func (m *MessageDAO) GetLocationById(id string) (*model.TdCmsImageLocation, error) {
 	var location []model.TdCmsImageLocation
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("location_id=?", id).Find(&location)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("location_id=?", id).Find(&location)
 	if err != nil {
 		return nil, err
 	}

models/message/message.go

@@ -4,6 +4,7 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"time"
 
 	"github.com/go-xorm/xorm"
@@ -27,7 +28,7 @@ func NewMessageDAO(ctx *utils.Context) *MessageDAO {
 func (m *MessageDAO) GetCmsInfoList(title, orgid string, page int, pageSize int) ([]model.TaCmsInfo, error) {
 	var cmsinfos []model.TaCmsInfo
 
-	dao := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid)
+	dao := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid)
 	if title != "" {
 		dao.And("info_name like '%" + title + "%'")
 	}
@@ -40,7 +41,7 @@ func (m *MessageDAO) GetCmsInfoList(title, orgid string, page int, pageSize int)
 func (m *MessageDAO) GetCmsInfoListCount(title, orgid string) (int, error) {
 	var cmsinfos []model.TaCmsInfo
 
-	dao := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid)
+	dao := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid)
 	if title != "" {
 		dao.And("info_name like '%" + title + "%'")
 	}
@@ -56,14 +57,14 @@ func (m *MessageDAO) GetCmsInfoListCount(title, orgid string) (int, error) {
 func (m *MessageDAO) GetCmsInfoByLocation(locationid, orgid string) ([]model.TaCmsInfo, error) {
 	var cmsinfos []model.TaCmsInfo
 
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid).And("location_id=?", locationid).Find(&cmsinfos)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).And("location_id=?", locationid).Find(&cmsinfos)
 	return cmsinfos, err
 }
 
 // GetCmsInfoByID 获取单条消息记录
 func (m *MessageDAO) GetCmsInfoByID(id string) (*model.TaCmsInfo, error) {
 	var cmsinfos []model.TaCmsInfo
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("info_id=?", id).Find(&cmsinfos)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("info_id=?", id).Find(&cmsinfos)
 	if err != nil {
 		return nil, err
 	}

models/message/news.go

@@ -23,7 +23,7 @@ func (m *MessageDAO) GetNewsList(locationid, orgid string, page int, pageSize in
 	var news []CmsNewsInfo
 	sql := `select * from ta_cms_news new left join (
 		select b.news_id,GROUP_CONCAT(a.location_name) location_names,GROUP_CONCAT(a.location_id) location_ids 
-		from td_cms_image_location a inner join ta_cms_location b on a.location_id=b.location_id and a.status=` + strconv.Itoa(models.STATUS_NORMAL) +
+		from td_cms_image_location a inner join ta_cms_location b on a.location_id=b.location_id and a.status>` + strconv.Itoa(models.STATUS_DEL) +
 		` and b.org_id='` + orgid + `' group by b.news_id
 		) c on new.news_id = c.news_id and new.status>` + strconv.Itoa(models.STATUS_DEL) + ` and new.org_id='` + orgid + `'`
 
@@ -54,7 +54,7 @@ func (m *MessageDAO) GetNewsListCount(locationid, orgid string) (int, error) {
 // GetNewsByLocation 根据位置获取咨询信息
 func (m *MessageDAO) GetNewsByLocation(locationid, orgid string) ([]model.TaCmsNews, error) {
 	var news []model.TaCmsNews
-	err := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid).In("news_id", builder.Select("news_id").From("ta_cms_location").Where(builder.Eq{"location_id": locationid})).Find(&news)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).In("news_id", builder.Select("news_id").From("ta_cms_location").Where(builder.Eq{"location_id": locationid})).Find(&news)
 	return news, err
 }
 
@@ -103,7 +103,7 @@ func (m *MessageDAO) DelNewsLocation(newsid string) error {
 
 // SaveNewsLocation 保存咨询与位置映射
 func (m *MessageDAO) SaveNewsLocation(newsid, locationsid string) error {
-	sql := `insert into ta_cms_location(location_id,news_id) select '` + newsid + `', location_id from td_cms_image_location where location_id in ('` + strings.Replace(locationsid, ",", "','", -1) + `') and status = ` + strconv.Itoa(models.STATUS_NORMAL)
+	sql := `insert into ta_cms_location(location_id,news_id) select '` + newsid + `', location_id from td_cms_image_location where location_id in ('` + strings.Replace(locationsid, ",", "','", -1) + `') and status > ` + strconv.Itoa(models.STATUS_DEL)
 	_, err := m.db.Exec(sql)
 	return err
 }

models/model/sys_case_user.go

@@ -5,12 +5,14 @@ import (
 )
 
 type SysCaseUser struct {
-	CaseUserId string    `xorm:"not null pk VARCHAR(64)"`
-	OrgId      string    `xorm:"VARCHAR(64)"`
-	CaseId     string    `xorm:"VARCHAR(64)"`
-	UserName   string    `xorm:"VARCHAR(50)"`
-	Tel        string    `xorm:"VARCHAR(50)"`
-	UserType   string    `xorm:"comment('案场管理员 咖啡师 消息收发员') VARCHAR(20)"`
+	CaseUserId string `xorm:"not null pk VARCHAR(64)"`
+	OrgId      string `xorm:"VARCHAR(64)"`
+	CaseId     string `xorm:"VARCHAR(64)"`
+	UserName   string `xorm:"VARCHAR(50)"`
+	Tel        string `xorm:"VARCHAR(50)"`
+	UserType   string `xorm:"comment('案场管理员
+            咖啡师
+            消息收发员') VARCHAR(20)"`
 	Status     int       `xorm:"SMALLINT(6)"`
 	CreateDate time.Time `xorm:"DATETIME"`
 }

models/model/sys_wechat_conf.go

@@ -3,7 +3,8 @@ package model
 type SysWechatConf struct {
 	ConfId string `xorm:"VARCHAR(64)"`
 	OrgId  string `xorm:"VARCHAR(64)"`
-	Type   int    `xorm:"comment('wechat 微信公众号  mini 小程序') SMALLINT(6)"`
+	Type   int    `xorm:"comment('wechat 微信公众号
+            mini 小程序') SMALLINT(6)"`
 	Appid  string `xorm:"VARCHAR(50)"`
 	Secret string `xorm:"VARCHAR(50)"`
 	Token  string `xorm:"VARCHAR(50)"`

models/model/ta_account_change.go

@@ -5,19 +5,25 @@ import (
 )
 
 type TaAccountChange struct {
-	DetailId     string    `xorm:"not null pk VARCHAR(64)"`
-	AccountId    string    `xorm:"VARCHAR(64)"`
-	UserId       string    `xorm:"VARCHAR(64)"`
-	UserName     string    `xorm:"VARCHAR(50)"`
-	OrgId        string    `xorm:"VARCHAR(64)"`
-	CaseId       string    `xorm:"VARCHAR(64)"`
-	ChangeType   string    `xorm:"comment('integral 积分  amount 城币') VARCHAR(20)"`
-	ChangeSource string    `xorm:"comment('vip vip卡充值  orders 订单消费  register 注册  perfect 完善资料  recommend 推荐') VARCHAR(20)"`
-	SourceId     string    `xorm:"VARCHAR(64)"`
-	SourceName   string    `xorm:"VARCHAR(255)"`
-	Amount       float32   `xorm:"FLOAT(8,2)"`
-	FloatType    string    `xorm:"comment('+  -') VARCHAR(5)"`
-	CreateDate   time.Time `xorm:"DATETIME"`
-	CreateUser   string    `xorm:"VARCHAR(64)"`
-	Status       int       `xorm:"SMALLINT(6)"`
+	DetailId   string `xorm:"not null pk VARCHAR(64)"`
+	AccountId  string `xorm:"VARCHAR(64)"`
+	UserId     string `xorm:"VARCHAR(64)"`
+	UserName   string `xorm:"VARCHAR(50)"`
+	OrgId      string `xorm:"VARCHAR(64)"`
+	CaseId     string `xorm:"VARCHAR(64)"`
+	ChangeType string `xorm:"comment('integral 积分
+            amount 城币') VARCHAR(20)"`
+	ChangeSource string `xorm:"comment('vip vip卡充值
+            orders 订单消费
+            register 注册
+            perfect 完善资料
+            recommend 推荐') VARCHAR(20)"`
+	SourceId   string  `xorm:"VARCHAR(64)"`
+	SourceName string  `xorm:"VARCHAR(255)"`
+	Amount     float32 `xorm:"FLOAT(8,2)"`
+	FloatType  string  `xorm:"comment('+
+            -') VARCHAR(5)"`
+	CreateDate time.Time `xorm:"DATETIME"`
+	CreateUser string    `xorm:"VARCHAR(64)"`
+	Status     int       `xorm:"SMALLINT(6)"`
 }

models/model/ta_case_key.go

@@ -0,0 +1,14 @@
+package model
+
+import (
+	"time"
+)
+
+type TaCaseKey struct {
+	KeyId      string    `xorm:"not null pk VARCHAR(64)"`
+	LockNum    string    `xorm:"VARCHAR(50)"`
+	Status     int       `xorm:"SMALLINT(6)"`
+	CreateDate time.Time `xorm:"DATETIME"`
+	OrgId      string    `xorm:"VARCHAR(64)"`
+	CaseId     string    `xorm:"VARCHAR(64)"`
+}

models/model/ta_case_key_use.go

@@ -0,0 +1,15 @@
+package model
+
+import (
+	"time"
+)
+
+type TaCaseKeyUse struct {
+	UseId        string    `xorm:"not null pk VARCHAR(64)"`
+	KeyId        string    `xorm:"VARCHAR(64)"`
+	CustomerId   string    `xorm:"VARCHAR(64)"`
+	CustomerName string    `xorm:"VARCHAR(50)"`
+	UseDate      time.Time `xorm:"DATETIME"`
+	ReturnDate   time.Time `xorm:"DATETIME"`
+	Status       int       `xorm:"SMALLINT(6)"`
+}

models/model/ta_cms_case_image.go

@@ -5,6 +5,7 @@ type TaCmsCaseImage struct {
 	CmsCaseId      string `xorm:"VARCHAR(64)"`
 	CaseImageUrl   string `xorm:"TEXT"`
 	Status         int    `xorm:"SMALLINT(6)"`
-	ImageType      string `xorm:"comment('cover：封面  detail：详情') VARCHAR(32)"`
-	Sort           int    `xorm:"INT(11)"`
+	ImageType      string `xorm:"comment('cover：封面
+            detail：详情') VARCHAR(32)"`
+	Sort int `xorm:"INT(11)"`
 }

models/model/ta_coupon_card2.go

@@ -0,0 +1,28 @@
+package model
+
+import (
+	"time"
+)
+
+type TaCouponCard2 struct {
+	CardId           string    `xorm:"not null pk VARCHAR(64)"`
+	CardTypeId       string    `xorm:"VARCHAR(64)"`
+	SendType         int       `xorm:"comment('0案场 1渠道') SMALLINT(6)"`
+	VideoUrl         string    `xorm:"TEXT"`
+	CoverUrl         string    `xorm:"TEXT"`
+	Price            float32   `xorm:"FLOAT(64)"`
+	StartDate        time.Time `xorm:"DATETIME"`
+	EndDate          time.Time `xorm:"DATETIME"`
+	ShareDescription string    `xorm:"VARCHAR(255)"`
+	RuleDescription  string    `xorm:"VARCHAR(400)"`
+	UseDescription   string    `xorm:"TEXT"`
+	TotalCount       int       `xorm:"INT(11)"`
+	SentCount        int       `xorm:"INT(11)"`
+	UsedCount        int       `xorm:"INT(11)"`
+	Status           int       `xorm:"comment('0未发布 1发布 2过期') SMALLINT(6)"`
+	CaseId           string    `xorm:"VARCHAR(64)"`
+	OrgId            string    `xorm:"VARCHAR(64)"`
+	CreateDate       time.Time `xorm:"DATETIME"`
+	CreateUser       string    `xorm:"VARCHAR(64)"`
+	IsOver           int       `xorm:"TINYINT(1)"`
+}

models/model/ta_customer.go

@@ -17,5 +17,4 @@ type TaCustomer struct {
 	RecommendName string    `xorm:"VARCHAR(50)"`
 	CreateDate    time.Time `xorm:"DATETIME"`
 	Status        int       `xorm:"SMALLINT(6)"`
-	UserId        string    `xorm:"VARCHAR(64)"`
 }

models/model/ta_experience_card.go

@@ -0,0 +1,25 @@
+package model
+
+import (
+	"time"
+)
+
+type TaExperienceCard struct {
+	CardId     string    `xorm:"not null pk VARCHAR(64)"`
+	CardTypeId string    `xorm:"VARCHAR(64)"`
+	SendType   string    `xorm:"comment('0案场 1渠道') VARCHAR(32)"`
+	VideoUrl   string    `xorm:"TEXT"`
+	CoverUrl   string    `xorm:"TEXT"`
+	Price      float32   `xorm:"FLOAT(64)"`
+	StartDate  time.Time `xorm:"DATETIME"`
+	EndDate    time.Time `xorm:"DATETIME"`
+	TotalCount int       `xorm:"INT(11)"`
+	SentCount  int       `xorm:"INT(11)"`
+	UsedCount  int       `xorm:"INT(11)"`
+	Status     string    `xorm:"comment('private未发布 public发布 over过期') VARCHAR(32)"`
+	CaseId     string    `xorm:"VARCHAR(64)"`
+	OrgId      string    `xorm:"VARCHAR(64)"`
+	CreateDate time.Time `xorm:"DATETIME"`
+	CreateUser string    `xorm:"VARCHAR(64)"`
+	IsOver     int       `xorm:"TINYINT(1)"`
+}

models/model/ta_goods_orders.go

@@ -5,24 +5,25 @@ import (
 )
 
 type TaGoodsOrders struct {
-	OrdersId     string    `xorm:"not null pk VARCHAR(64)"`
-	OrdersNo     string    `xorm:"VARCHAR(32)"`
-	OrgId        string    `xorm:"VARCHAR(64)"`
-	CaseId       string    `xorm:"VARCHAR(64)"`
-	AreaId       string    `xorm:"VARCHAR(64)"`
-	AreaName     string    `xorm:"VARCHAR(50)"`
-	TableId      string    `xorm:"VARCHAR(64)"`
-	TableName    string    `xorm:"VARCHAR(50)"`
-	Amount       string    `xorm:"DECIMAL(8,2)"`
-	CreateDate   time.Time `xorm:"DATETIME"`
-	Status       int       `xorm:"SMALLINT(6)"`
-	PayType      int       `xorm:"comment('vip VIP卡城币抵用 coupon 优惠券抵用') SMALLINT(6)"`
-	UserType     int       `xorm:"SMALLINT(6)"`
-	UserId       string    `xorm:"VARCHAR(64)"`
-	UserName     string    `xorm:"VARCHAR(50)"`
-	OrdersNum    int       `xorm:"INT(11)"`
-	Remark       string    `xorm:"TEXT"`
-	IsPay        int       `xorm:"TINYINT(1)"`
-	ActualAmount string    `xorm:"DECIMAL(8,2)"`
-	CouponAmount string    `xorm:"DECIMAL(8,2)"`
+	OrdersId   string    `xorm:"not null pk VARCHAR(64)"`
+	OrdersNo   string    `xorm:"VARCHAR(32)"`
+	OrgId      string    `xorm:"VARCHAR(64)"`
+	CaseId     string    `xorm:"VARCHAR(64)"`
+	AreaId     string    `xorm:"VARCHAR(64)"`
+	AreaName   string    `xorm:"VARCHAR(50)"`
+	TableId    string    `xorm:"VARCHAR(64)"`
+	TableName  string    `xorm:"VARCHAR(50)"`
+	Amount     string    `xorm:"DECIMAL(8,2)"`
+	CreateDate time.Time `xorm:"DATETIME"`
+	Status     int       `xorm:"SMALLINT(6)"`
+	PayType    int       `xorm:"comment('vip VIP卡城币抵用
+            coupon 优惠券抵用') SMALLINT(6)"`
+	UserType     int    `xorm:"SMALLINT(6)"`
+	UserId       string `xorm:"VARCHAR(64)"`
+	UserName     string `xorm:"VARCHAR(50)"`
+	OrdersNum    int    `xorm:"INT(11)"`
+	Remark       string `xorm:"TEXT"`
+	IsPay        int    `xorm:"TINYINT(1)"`
+	ActualAmount string `xorm:"DECIMAL(8,2)"`
+	CouponAmount string `xorm:"DECIMAL(8,2)"`
 }

models/model/ta_user_mapping.go

@@ -1,10 +1,12 @@
 package model
 
 type TaUserMapping struct {
-	MappingId   string `xorm:"not null pk VARCHAR(64)"`
-	UserId      string `xorm:"VARCHAR(64)"`
-	UserType    string `xorm:"comment('customer 为会员  user 为后台用户') VARCHAR(50)"`
-	AccountType string `xorm:"comment('wechat 微信公众号 mini 小程序') VARCHAR(50)"`
+	MappingId string `xorm:"not null pk VARCHAR(64)"`
+	UserId    string `xorm:"VARCHAR(64)"`
+	UserType  string `xorm:"comment('customer 为会员
+            user 为后台用户') VARCHAR(50)"`
+	AccountType string `xorm:"comment('wechat 微信公众号
+            mini 小程序') VARCHAR(50)"`
 	Openid      string `xorm:"VARCHAR(200)"`
 	Uuid        string `xorm:"VARCHAR(200)"`
 	AccountInfo string `xorm:"TEXT"`