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

src/dao/installment_payment_list_dao.go

@@ -1,4 +1,4 @@
-package dao
+package dao
 
 import (
 	"code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/models"
@@ -7,6 +7,10 @@ import (
 
 type InstallmentPaymentListDao interface {
 	GetInstallmentPaymentListById(id int) (m *models.InstallmentPaymentList, err error)
+	GetInstallmentPaymentListByIdSess(sess *xorm.Session, oid string) (m *models.InstallmentPaymentList, err error)
+	GetInstallmentPaymentListByOidSess(sess *xorm.Session, oid string) (m *models.InstallmentPaymentList, err error)
+	GetInstallmentPaymentListByOid(oid string) (m *models.InstallmentPaymentList, err error)
+	FinInstallmentPaymentList(arg map[string]string) (m *[]models.InstallmentPaymentList, err error)
 	UpdateInstallmentPaymentListBySess(sess *xorm.Session, m *models.InstallmentPaymentList, forceColums ...string) (int64, error)
 	InsertInstallmentPaymentList(m *models.InstallmentPaymentList) (id int, err error)
 }

src/dao/installment_payment_repaid_flow_dao.go

@@ -1,4 +1,4 @@
-package dao
+package dao
 
 import (
 	"code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/models"
@@ -7,4 +7,5 @@ import (
 
 type InstallmentPaymentRepaidFlowDao interface {
 	InsertInstallmentPaymentRepaidFlowBySession(session *xorm.Session, m *models.InstallmentPaymentRepaidFlow) (id int, err error)
+	FinInstallmentRepaidFlow(arg map[string]string) (m *[]models.InstallmentPaymentRepaidFlow, err error)
 }

src/dao/installment_payment_scheme_dao.go

@@ -1,8 +1,9 @@
-package dao
+package dao
 
 import "code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/models"
 
 type InstallmentPaymentSchemeDao interface {
 	InsertInstallmentPaymentScheme(m *models.InstallmentPaymentScheme) (id int, err error)
 	GetInstallmentPaymentSchemeById(id int) (m *models.InstallmentPaymentScheme, err error)
+	FindInstallmentPaymentScheme() (m *[]models.InstallmentPaymentScheme, err error)
 }

src/dao/installment_payment_scheme_with_goods_dao.go

@@ -1,5 +1,11 @@
-package dao
+package dao
+
+import (
+	"code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/models"
+	"xorm.io/xorm"
+)
 
 type InstallmentPaymentSchemeWithGoodsDao interface {
-	//TODO:: You can add specific method definitions here
+	GetInstallmentPaymentSchemeGoodsByGoodsId(goodsId int) (m *models.InstallmentPaymentSchemeWithGoods, err error)
+	GetInstallmentPaymentSchemeGoodsByGoodsIdSess(sess *xorm.Session, goodsId int) (m *models.InstallmentPaymentSchemeWithGoods, err error)
 }

src/implement/installment_payment_list_db.go

@@ -1,8 +1,9 @@
-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"
+	zhios_order_relate_utils "code.fnuoos.com/go_rely_warehouse/zyos_model.git/utils"
 	zhios_order_relate_logx "code.fnuoos.com/go_rely_warehouse/zyos_model.git/utils/logx"
 	"xorm.io/xorm"
 )
@@ -39,6 +40,17 @@ func (i InstallmentPaymentListDb) UpdateInstallmentPaymentListBySess(sess *xorm.
 	}
 	return affected, nil
 }
+func (i InstallmentPaymentListDb) GetInstallmentPaymentListByOid(id string) (m *models.InstallmentPaymentList, err error) {
+	m = new(models.InstallmentPaymentList)
+	has, err := i.Db.Where("ord_id =?", id).Get(m)
+	if err != nil {
+		return nil, zhios_order_relate_logx.Error(err)
+	}
+	if has == false {
+		return nil, nil
+	}
+	return m, nil
+}
 
 func (i InstallmentPaymentListDb) GetInstallmentPaymentListById(id int) (m *models.InstallmentPaymentList, err error) {
 	m = new(models.InstallmentPaymentList)
@@ -51,3 +63,39 @@ func (i InstallmentPaymentListDb) GetInstallmentPaymentListById(id int) (m *mode
 	}
 	return m, nil
 }
+func (i InstallmentPaymentListDb) GetInstallmentPaymentListByIdSess(sess *xorm.Session, id string) (m *models.InstallmentPaymentList, err error) {
+	m = new(models.InstallmentPaymentList)
+	has, err := sess.Where("id =?", id).Get(m)
+	if err != nil {
+		return nil, zhios_order_relate_logx.Error(err)
+	}
+	if has == false {
+		return nil, nil
+	}
+	return m, nil
+}
+func (i InstallmentPaymentListDb) GetInstallmentPaymentListByOidSess(sess *xorm.Session, id string) (m *models.InstallmentPaymentList, err error) {
+	m = new(models.InstallmentPaymentList)
+	has, err := sess.Where("ord_id =?", id).Get(m)
+	if err != nil {
+		return nil, zhios_order_relate_logx.Error(err)
+	}
+	if has == false {
+		return nil, nil
+	}
+	return m, nil
+}
+func (i InstallmentPaymentListDb) FinInstallmentPaymentList(arg map[string]string) (m *[]models.InstallmentPaymentList, err error) {
+	mm := make([]models.InstallmentPaymentList, 0)
+	sess := i.Db.Where("uid=?", arg["uid"])
+	if arg["state"] != "" {
+		sess.And("is_repaid_off=?", zhios_order_relate_utils.StrToInt(arg["state"])-1)
+	}
+	size := zhios_order_relate_utils.StrToInt(arg["size"])
+	start := (zhios_order_relate_utils.StrToInt(arg["p"]) - 1) * size
+	err = sess.Limit(size, start).Desc("id").Find(&mm)
+	if err != nil {
+		return nil, zhios_order_relate_logx.Error(err)
+	}
+	return &mm, nil
+}

src/implement/installment_payment_repaid_flow_db.go

@@ -1,8 +1,9 @@
-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"
+	zhios_order_relate_logx "code.fnuoos.com/go_rely_warehouse/zyos_model.git/utils/logx"
 	"xorm.io/xorm"
 )
 
@@ -21,3 +22,12 @@ func (i InstallmentPaymentRepaidFlowDb) InsertInstallmentPaymentRepaidFlowBySess
 	}
 	return m.Id, nil
 }
+func (i InstallmentPaymentRepaidFlowDb) FinInstallmentRepaidFlow(arg map[string]string) (m *[]models.InstallmentPaymentRepaidFlow, err error) {
+	mm := make([]models.InstallmentPaymentRepaidFlow, 0)
+	sess := i.Db.Where("uid=?", arg["uid"]).And("record_id=?", arg["id"])
+	err = sess.Find(&mm)
+	if err != nil {
+		return nil, zhios_order_relate_logx.Error(err)
+	}
+	return &mm, nil
+}

src/implement/installment_payment_scheme_db.go

@@ -1,4 +1,4 @@
-package implement
+package implement
 
 import (
 	"code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/dao"
@@ -35,3 +35,11 @@ func (i InstallmentPaymentSchemeDb) GetInstallmentPaymentSchemeById(id int) (m *
 	}
 	return m, nil
 }
+func (i InstallmentPaymentSchemeDb) FindInstallmentPaymentScheme() (m *[]models.InstallmentPaymentScheme, err error) {
+	mm := make([]models.InstallmentPaymentScheme, 0)
+	err = i.Db.Where("1=1").Find(&mm)
+	if err != nil {
+		return nil, zhios_order_relate_logx.Error(err)
+	}
+	return &mm, nil
+}

src/implement/installment_payment_scheme_with_goods_db.go

@@ -1,7 +1,9 @@
-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"
+	zhios_order_relate_logx "code.fnuoos.com/go_rely_warehouse/zyos_model.git/utils/logx"
 	"xorm.io/xorm"
 )
 
@@ -12,3 +14,25 @@ type InstallmentPaymentSchemeWithGoodsDb struct {
 func NewInstallmentPaymentSchemeWithGoodsDb(engine *xorm.Engine) dao.InstallmentPaymentSchemeWithGoodsDao {
 	return &InstallmentPaymentSchemeWithGoodsDb{Db: engine}
 }
+func (i InstallmentPaymentSchemeWithGoodsDb) GetInstallmentPaymentSchemeGoodsByGoodsId(goodsId int) (m *models.InstallmentPaymentSchemeWithGoods, err error) {
+	m = new(models.InstallmentPaymentSchemeWithGoods)
+	has, err := i.Db.Where("goods_id =?", goodsId).Get(m)
+	if err != nil {
+		return nil, zhios_order_relate_logx.Error(err)
+	}
+	if has == false {
+		return nil, nil
+	}
+	return m, nil
+}
+func (i InstallmentPaymentSchemeWithGoodsDb) GetInstallmentPaymentSchemeGoodsByGoodsIdSess(sess *xorm.Session, goodsId int) (m *models.InstallmentPaymentSchemeWithGoods, err error) {
+	m = new(models.InstallmentPaymentSchemeWithGoods)
+	has, err := sess.Where("goods_id =?", goodsId).Get(m)
+	if err != nil {
+		return nil, zhios_order_relate_logx.Error(err)
+	}
+	if has == false {
+		return nil, nil
+	}
+	return m, nil
+}

src/models/happy_orchard_basic_setting.go

@@ -33,4 +33,6 @@ type HappyOrchardBasicSetting struct {
 	VirtualRewardIsAutoSend       int    `json:"virtual_reward_is_auto_send" xorm:"not null default 0 comment('虚拟奖品是否自动发放(1:是 2:否)') TINYINT(1)"`
 	CreateAt                      string `json:"create_at" xorm:"not null default 'CURRENT_TIMESTAMP' DATETIME"`
 	UpdateAt                      string `json:"update_at" xorm:"not null default 'CURRENT_TIMESTAMP' DATETIME"`
+	SignAdvId                     int    `json:"sign_adv_id" xorm:"not null default 0 comment('签到看的广告ID') TINYINT(1)"`
+	IsCanMultiple                 int    `json:"is_can_multiple" xorm:"not null default 0 comment('是否有翻倍 0否 1是') TINYINT(1)"`
 }

src/models/installment_payment_list.go

@@ -6,9 +6,12 @@ type InstallmentPaymentList struct {
 	GoodsId                       int    `json:"goods_id" xorm:"not null default 0 comment('商品ID') INT(11)"`
 	OrdId                         int64  `json:"ord_id" xorm:"not null default 0 comment('订单ID') BIGINT(20)"`
 	TotalAmount                   string `json:"total_amount" xorm:"not null default 0.00 comment('总金额') DECIMAL(12,2)"`
+	Commission                    string `json:"commission" xorm:"not null default 0.00 comment('总金额') DECIMAL(12,2)"`
 	InstallmentNums               int    `json:"installment_nums" xorm:"not null default 0 comment('分期数') TINYINT(3)"`
 	AlreadyRepaidInstallmentNums  int    `json:"already_repaid_installment_nums" xorm:"not null default 0 comment('已换分期数') TINYINT(3)"`
 	RepaymentAmountPerInstallment string `json:"repayment_amount_per_installment" xorm:"not null default 0.00 comment('每期还款金额') DECIMAL(12,2)"`
+	GoodsTitle                    string `json:"goods_title" xorm:"not null default '' comment('标题') VARCHAR(255)"`
+	GoodsImg                      string `json:"goods_imgg" xorm:"not null default '' comment('图片') VARCHAR(255)"`
 	IsRepaidOff                   int    `json:"is_repaid_off" xorm:"not null default 0 comment('是否已偿还完(0:未偿还完 1:已偿还完)') TINYINT(1)"`
 	CreateAt                      string `json:"create_at" xorm:"not null default 'CURRENT_TIMESTAMP' comment('创建时间') DATETIME"`
 	UpdateAt                      string `json:"update_at" xorm:"not null default 'CURRENT_TIMESTAMP' comment('更新时间') DATETIME"`

src/models/installment_payment_repaid_flow.go

@@ -8,4 +8,5 @@ type InstallmentPaymentRepaidFlow struct {
 	WhichRepaymentPeriod int    `json:"which_repayment_period" xorm:"not null default 1 comment('第x还款') TINYINT(3)"`
 	CreateAt             string `json:"create_at" xorm:"not null default 'CURRENT_TIMESTAMP' comment('创建时间') DATETIME"`
 	UpdateAt             string `json:"update_at" xorm:"not null default 'CURRENT_TIMESTAMP' comment('更新时间') DATETIME"`
+	OrdId                int64  `json:"ord_id" xorm:"not null default 0 comment('订单ID') BIGINT(20)"`
 }