Merge branch 'master' of https://code.fnuoos.com/go_rely_warehouse/zyos_model

src/dao/super_cloud_issuance_copy_writing_dao.go

@@ -1,5 +1,7 @@
 package dao
 
+import "code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/models"
+
 type SuperCloudIssuanceCopyWritingDao interface {
-	//TODO:: You can add specific method definitions here
+	FindSuperCloudIssuanceCopyWriting() (mm *[]models.SuperCloudIssuanceCopyWriting, err error)
 }

src/dao/super_cloud_issuance_goods_category_dao.go

@@ -1,5 +1,7 @@
 package dao
 
+import "code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/models"
+
 type SuperCloudIssuanceGoodsCategoryDao interface {
-	//TODO:: You can add specific method definitions here
+	FindSuperCloudIssuanceGoodsCategory(start, limit int) (mm *[]models.SuperCloudIssuanceGoodsCategory, err error)
 }

src/dao/super_cloud_issuance_goods_dao.go

@@ -1,5 +1,7 @@
 package dao
 
+import "code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/models"
+
 type SuperCloudIssuanceGoodsDao interface {
-	//TODO:: You can add specific method definitions here
+	FindSuperCloudIssuanceGoods(id string, cid, start, limit int) (mm *[]models.SuperCloudIssuanceGoods, err error)
 }

src/dao/super_cloud_issuance_user_robot_bind_circle_dao.go

@@ -1,5 +1,7 @@
-package dao
+package dao
+
+import "code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/models"
 
 type SuperCloudIssuanceUserRobotBindCircleDao interface {
-	//TODO:: You can add specific method definitions here
+	GetSuperCloudIssuanceUserRobotBindCircle(uid, robotId int) (mm *models.SuperCloudIssuanceUserRobotBindCircle)
 }

src/implement/super_cloud_issuance_copy_writing_db.go

@@ -2,6 +2,8 @@ package implement
 
 import (
 	"code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/dao"
+	"code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/models"
+	zhios_order_relate_logx "code.fnuoos.com/go_rely_warehouse/zyos_model.git/utils/logx"
 	"xorm.io/xorm"
 )
 
@@ -12,3 +14,10 @@ type SuperCloudIssuanceCopyWritingDb struct {
 func NewSuperCloudIssuanceCopyWritingDb(engine *xorm.Engine) dao.SuperCloudIssuanceCopyWritingDao {
 	return &SuperCloudIssuanceCopyWritingDb{Db: engine}
 }
+func (h SuperCloudIssuanceCopyWritingDb) FindSuperCloudIssuanceCopyWriting() (mm *[]models.SuperCloudIssuanceCopyWriting, err error) {
+	var m []models.SuperCloudIssuanceCopyWriting
+	if err := h.Db.Where("1=1").Find(&m); err != nil {
+		return nil, zhios_order_relate_logx.Error(err)
+	}
+	return &m, nil
+}

src/implement/super_cloud_issuance_goods_category_db.go

@@ -2,6 +2,8 @@ package implement
 
 import (
 	"code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/dao"
+	"code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/models"
+	zhios_order_relate_logx "code.fnuoos.com/go_rely_warehouse/zyos_model.git/utils/logx"
 	"xorm.io/xorm"
 )
 
@@ -12,3 +14,11 @@ type SuperCloudIssuanceGoodsCategoryDb struct {
 func NewSuperCloudIssuanceGoodsCategoryDb(engine *xorm.Engine) dao.SuperCloudIssuanceGoodsCategoryDao {
 	return &SuperCloudIssuanceGoodsCategoryDb{Db: engine}
 }
+
+func (h SuperCloudIssuanceGoodsCategoryDb) FindSuperCloudIssuanceGoodsCategory(start, limit int) (mm *[]models.SuperCloudIssuanceGoodsCategory, err error) {
+	var m []models.SuperCloudIssuanceGoodsCategory
+	if err := h.Db.Where("1=1").Limit(limit, start).Find(&m); err != nil {
+		return nil, zhios_order_relate_logx.Error(err)
+	}
+	return &m, nil
+}

src/implement/super_cloud_issuance_goods_db.go

@@ -2,6 +2,8 @@ package implement
 
 import (
 	"code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/dao"
+	"code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/models"
+	zhios_order_relate_logx "code.fnuoos.com/go_rely_warehouse/zyos_model.git/utils/logx"
 	"xorm.io/xorm"
 )
 
@@ -12,3 +14,17 @@ type SuperCloudIssuanceGoodsDb struct {
 func NewSuperCloudIssuanceGoodsDb(engine *xorm.Engine) dao.SuperCloudIssuanceGoodsDao {
 	return &SuperCloudIssuanceGoodsDb{Db: engine}
 }
+func (h SuperCloudIssuanceGoodsDb) FindSuperCloudIssuanceGoods(id string, cid, start, limit int) (mm *[]models.SuperCloudIssuanceGoods, err error) {
+	var m []models.SuperCloudIssuanceGoods
+	sess := h.Db.Where("1=1")
+	if cid > 0 {
+		sess.And("cloud_issuance_category_id=?", cid)
+	}
+	if id != "" {
+		sess.And("id=?", id)
+	}
+	if err := sess.Limit(limit, start).OrderBy("create_at desc,id desc").Find(&m); err != nil {
+		return nil, zhios_order_relate_logx.Error(err)
+	}
+	return &m, nil
+}

src/implement/super_cloud_issuance_user_robot_bind_circle_db.go

@@ -1,7 +1,8 @@
-package implement
+package implement
 
 import (
 	"code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/dao"
+	"code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/models"
 	"xorm.io/xorm"
 )
 
@@ -12,3 +13,10 @@ type SuperCloudIssuanceUserRobotBindCircleDb struct {
 func NewSuperCloudIssuanceUserRobotBindCircleDb(engine *xorm.Engine) dao.SuperCloudIssuanceUserRobotBindCircleDao {
 	return &SuperCloudIssuanceUserRobotBindCircleDb{Db: engine}
 }
+func (h SuperCloudIssuanceUserRobotBindCircleDb) GetSuperCloudIssuanceUserRobotBindCircle(uid, robotId int) (mm *models.SuperCloudIssuanceUserRobotBindCircle) {
+	var m models.SuperCloudIssuanceUserRobotBindCircle
+	if has, err := h.Db.Where("robot_id=? and uid=?", robotId, uid).Get(&m); err != nil || has == false {
+		return nil
+	}
+	return &m
+}

src/models/super_cloud_issuance_goods.go

@@ -18,6 +18,7 @@ type SuperCloudIssuanceGoods struct {
 	GoodsContent            string `json:"goods_content" xorm:"comment('商品文案（以json存）') LONGTEXT"`
 	GoodsImg                string `json:"goods_img" xorm:"comment('商品主图') VARCHAR(255)"`
 	GoodsImgUrl             string `json:"goods_img_url" xorm:"comment('商品主图URL') VARCHAR(255)"`
+	Commission              string `json:"commission" xorm:"comment('佣金比例') VARCHAR(255)"`
 	CreateAt                string `json:"create_at" xorm:"not null DATETIME"`
 	UpdateAt                string `json:"update_at" xorm:"not null DATETIME"`
 	CloudIssuanceCategoryId int    `json:"cloud_issuance_category_id" xorm:"not null default 0 comment('云发单所属分类id') INT(11)"`