Merge remote-tracking branch 'origin/master'

src/dao/generate_wx_ad_data_dao.go

@@ -1,5 +0,0 @@
-package dao
-
-type GenerateWxAdDataDao interface {
-	//TODO:: You can add specific method definitions here
-}

src/db.go

@@ -16,8 +16,9 @@ import (
 
 var Db *xorm.Engine
 
-//根据DB配置文件初始化数据库
+// 根据DB配置文件初始化数据库
 func InitDB(c *cfg.DBCfg) error {
+	fmt.Println("db host::::", fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4", c.User, c.Psw, c.Host, c.Name))
 	var (
 		err error
 		f   *os.File

src/super/dao/master_data_statistics_dao.go

@@ -0,0 +1,14 @@
+package dao
+
+import (
+	"code.fnuoos.com/zhimeng/model.git/src/super/model"
+	"xorm.io/xorm"
+)
+
+type MasterDataStatisticsDao interface {
+	GetMasterDataStatistics(uuid int, date string) (data *model.MasterDataStatistics, err error)
+	UpdateMasterDataStatistics(m *model.MasterDataStatistics, columns ...string) (int64, error)
+	UpdateMasterDataStatisticsBySession(session *xorm.Session, m *model.MasterDataStatistics, columns ...string) (int64, error)
+	FindMasterDataStatisticsList(uuid, startDate, endDate string, page, limit int) (list []model.MasterDataStatistics, total int64, err error)
+	MasterDataStatisticsInsert(m *model.MasterDataStatistics) (int64, error)
+}

src/super/implement/master_data_statistics_implement.go

@@ -0,0 +1,70 @@
+package implement
+
+import (
+	"code.fnuoos.com/zhimeng/model.git/src/super/dao"
+	"code.fnuoos.com/zhimeng/model.git/src/super/model"
+	zhios_order_relate_logx "code.fnuoos.com/zhimeng/model.git/utils/logx"
+	"xorm.io/xorm"
+)
+
+func NewMasterDataStatisticsDb(engine *xorm.Engine) dao.MasterDataStatisticsDao {
+	return &MasterDataStatisticsDb{Db: engine}
+}
+
+type MasterDataStatisticsDb struct {
+	Db *xorm.Engine
+}
+
+func (m MasterDataStatisticsDb) MasterDataStatisticsInsert(mm *model.MasterDataStatistics) (int64, error) {
+	insertAffected, err := m.Db.InsertOne(m)
+	if err != nil {
+		return 0, err
+	}
+	return insertAffected, nil
+}
+
+func (m MasterDataStatisticsDb) GetMasterDataStatistics(uuid int, date string) (data *model.MasterDataStatistics, err error) {
+	data = new(model.MasterDataStatistics)
+	has, err := m.Db.Where("uuid =? and date =?", uuid, date).Get(data)
+	if err != nil {
+		return nil, zhios_order_relate_logx.Error(err)
+	}
+	if has == false {
+		return nil, nil
+	}
+	return data, nil
+}
+
+func (m MasterDataStatisticsDb) UpdateMasterDataStatistics(mm *model.MasterDataStatistics, columns ...string) (int64, error) {
+	affected, err := m.Db.Where("id =?", mm.Id).Cols(columns...).Update(mm)
+	if err != nil {
+		return 0, err
+	}
+	return affected, nil
+}
+
+func (m MasterDataStatisticsDb) UpdateMasterDataStatisticsBySession(session *xorm.Session, mm *model.MasterDataStatistics, columns ...string) (int64, error) {
+	affected, err := session.Where("id =?", mm.Id).Cols(columns...).Update(mm)
+	if err != nil {
+		return 0, err
+	}
+	return affected, nil
+}
+
+func (m MasterDataStatisticsDb) FindMasterDataStatisticsList(uuid, startDate, endDate string, page, limit int) (list []model.MasterDataStatistics, total int64, err error) {
+	sess := m.Db.OrderBy("date desc,id desc").Limit(limit, (page-1)*limit)
+	if uuid != "" {
+		sess.And("uuid = ?", uuid)
+	}
+	if startDate != "" {
+		sess.And("date>=", startDate)
+	}
+	if endDate != "" {
+		sess.And("date<=", endDate)
+	}
+	total, err = sess.FindAndCount(&list)
+	if err != nil {
+		return nil, 0, err
+	}
+	return
+}

src/super/model/master_data_statistics.go

@@ -0,0 +1,25 @@
+package model
+
+type MasterDataStatistics struct {
+	Id                           int    `json:"id" xorm:"not null pk autoincr INT(11)"`
+	Uuid                         int    `json:"uuid" xorm:"not null default 0 comment('站长id') index INT(11)"`
+	TodayIncome                  int    `json:"today_income" xorm:"not null default 0 comment('今日收益(分)') INT(11)"`
+	SevenDayIncome               int    `json:"seven_day_income" xorm:"not null default 0 comment('七日收益(分)') INT(11)"`
+	ThisMonthIncome              int    `json:"this_month_income" xorm:"not null default 0 comment('本月收益(分)') INT(11)"`
+	LastMonthIncome              int    `json:"last_month_income" xorm:"not null default 0 comment('上月收益(分)') INT(11)"`
+	MediumTodayIncome            int    `json:"medium_today_income" xorm:"not null default 0 comment('媒体今日收益(分)') INT(11)"`
+	MediumSevenDayIncome         int    `json:"medium_seven_day_income" xorm:"not null default 0 comment('媒体七日收益(分)') INT(11)"`
+	MediumThisMonthIncome        int    `json:"medium_this_month_income" xorm:"not null default 0 comment('媒体本月收益(分)') INT(11)"`
+	MediumLastMonthIncome        int    `json:"medium_last_month_income" xorm:"not null default 0 comment('媒体上月收益(分)') INT(11)"`
+	AgentTodayIncome             int    `json:"agent_today_income" xorm:"not null default 0 comment('代理今日收益(分)') INT(11)"`
+	AgentSevenDayIncome          int    `json:"agent_seven_day_income" xorm:"not null default 0 comment('代理七日收益(分)') INT(11)"`
+	AgentThisMonthIncome         int    `json:"agent_this_month_income" xorm:"not null default 0 comment('代理本月收益(分)') INT(11)"`
+	AgentLastMonthIncome         int    `json:"agent_last_month_income" xorm:"not null default 0 comment('代理上月收益(分)') INT(11)"`
+	MediumTodayExposureCount     int    `json:"medium_today_exposure_count" xorm:"not null default 0 comment('媒体今日曝光量') INT(11)"`
+	MediumSevenDayExposureCount  int    `json:"medium_seven_day_exposure_count" xorm:"not null default 0 comment('媒体七日曝光量') INT(11)"`
+	MediumThisMonthExposureCount int    `json:"medium_this_month_exposure_count" xorm:"not null default 0 comment('媒体本月曝光量') INT(11)"`
+	MediumLastMonthExposureCount int    `json:"medium_last_month_exposure_count" xorm:"not null default 0 comment('媒体上月曝光量') INT(11)"`
+	Date                         string `json:"date" xorm:"not null comment('日期') DATE"`
+	CreateAt                     string `json:"create_at" xorm:"not null default 'CURRENT_TIMESTAMP' DATETIME"`
+	UpdateAt                     string `json:"update_at" xorm:"not null default 'CURRENT_TIMESTAMP' DATETIME"`
+}