Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go/partnermg into dev

# Conflicts:
#	pkg/infrastructure/pg/models/order.go

@@ -20,9 +20,9 @@ require (
 	github.com/moul/http2curl v1.0.0 // indirect
 	github.com/moul/http2curl v1.0.0 // indirect
 	github.com/onsi/ginkgo v1.13.0
 	github.com/onsi/ginkgo v1.13.0
 	github.com/onsi/gomega v1.10.1
 	github.com/onsi/gomega v1.10.1
-	github.com/prometheus/common v0.10.0 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 // indirect
 	github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 // indirect
+	github.com/shopspring/decimal v1.2.0
 	github.com/smartystreets/goconvey v1.6.4 // indirect
 	github.com/smartystreets/goconvey v1.6.4 // indirect
 	github.com/valyala/fasthttp v1.14.0 // indirect
 	github.com/valyala/fasthttp v1.14.0 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect

@@ -20,3 +20,11 @@ func CreatePartnerInfoDao(options map[string]interface{}) (*dao.PartnerInfoDao,
 	}
 	}
 	return dao.NewPartnerInfoDao(transactionContext)
 	return dao.NewPartnerInfoDao(transactionContext)
 }
 }
+
+func CreateOrderDao(options map[string]interface{}) (*dao.OrderDao, error) {
+	var transactionContext *transaction.TransactionContext
+	if value, ok := options["transactionContext"]; ok {
+		transactionContext = value.(*transaction.TransactionContext)
+	}
+	return dao.NewOrderDao(transactionContext)
+}

@@ -32,3 +32,12 @@ func CreateAdminPermissionRepository(options map[string]interface{}) (domain.Adm
 	}
 	}
 	return repository.NewAdminPermissionRepository(transactionContext)
 	return repository.NewAdminPermissionRepository(transactionContext)
 }
 }
+
+//CreatePartnerInfoRepository 合伙人信息
+func CreateOrderPaymentRepository(options map[string]interface{}) (domain.OrderPaymentRepository, error) {
+	var transactionContext *transaction.TransactionContext
+	if value, ok := options["transactionContext"]; ok {
+		transactionContext = value.(*transaction.TransactionContext)
+	}
+	return repository.NewOrderPaymentRepository(transactionContext)
+}

+package command
+
+type CreateOrderPaymentCommand struct {
+	//订单编号
+	OrderId            int64                `json:"orderId"`
+	DivdendPaymentItem []DivdendPyamentItem `json:"dividendPayment"`
+	TotalPaymentAmount float64              `json:"payment_amount"`
+}
+
+type DivdendPyamentItem struct {
+	// 货款
+	PaymentForGoods float64 `json:"paymentForGoods,omitempty"`
+	// 支付状态
+	StateOfPayment int `json:"stateOfPayment,omitempty"`
+	//支付批次
+	PaymentSn int `json:"paymentSn,omitempty"`
+}
+
+func (command CreateOrderPaymentCommand) ValidateCommand() error {
+	return nil
+}

+package query
+
+type ListOrderPaymentQuery struct {
+	// 合伙人类别
+	OrderId int64 `json:"orderId"`
+}
+
+func (q *ListOrderPaymentQuery) ValidateQuery() error {
+
+	return nil
+}

+package service
+
+import (
+	"github.com/linmadan/egglib-go/core/application"
+	"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/factory"
+	"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/order_payment/command"
+	"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/order_payment/query"
+	"time"
+
+	//"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/order_payment/query"
+	"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain"
+	"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/lib"
+)
+
+// 客户价值服务
+type OrderPaymentService struct {
+}
+
+func NewOrderPaymentService(options map[string]interface{}) *OrderPaymentService {
+	newOrderPaymentService := &OrderPaymentService{}
+	return newOrderPaymentService
+}
+
+// 创建订单支付数据
+func (OrderPaymentService *OrderPaymentService) CreateOrderPayment(command *command.CreateOrderPaymentCommand) (data interface{}, err error) {
+	var (
+		transactionContext, _ = factory.CreateTransactionContext(nil)
+		OrderDao, _           = factory.CreateOrderDao(map[string]interface{}{"transactionContext": transactionContext})
+	)
+	if err = command.ValidateCommand(); err != nil {
+		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
+	}
+	if err = transactionContext.StartTransaction(); err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err == nil {
+			err = transactionContext.CommitTransaction()
+		}
+		if err != nil {
+			transactionContext.RollbackTransaction()
+		}
+	}()
+	//检查订单是否存在
+
+	var OrderPaymentRepository domain.OrderPaymentRepository
+	if OrderPaymentRepository, err = factory.CreateOrderPaymentRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	orderBase, e := OrderDao.GetOrderBaseInfo(command.OrderId)
+	if e != nil {
+		err = e
+		return
+	}
+
+	for i := range command.DivdendPaymentItem {
+		paymentItem := command.DivdendPaymentItem[i]
+		dm := &domain.OrderPayment{
+			OrderId:       command.OrderId,
+			PartnerId:     0,
+			PaymentAmount: 0,
+			BonusAmount:   0, //计算分红金额
+			BonusStatus:   0,
+			CreateAt:      time.Now(),
+			PaymentSn:     paymentItem.PaymentSn,
+			UpdateAt:      time.Now(),
+		}
+
+		//检查货款 已存在 / 未存在
+		if findDm, e := OrderPaymentRepository.FindOne(domain.OrderPaymentFindOneQuery{OrderId: command.OrderId, PaymentSn: paymentItem.PaymentSn}); e == nil {
+			if findDm.BonusStatus == domain.BonusPaid {
+				continue
+			}
+			dm = findDm
+		}
+
+		dm.PartnerId = orderBase["PartnerId"].(int64)
+		bonousPercent := orderBase["PartnerBonusPercent"].(float64)
+		dm.BonusAmount = paymentItem.PaymentForGoods * (bonousPercent / 100.0)
+		dm.PaymentAmount = paymentItem.PaymentForGoods
+		dm.BonusStatus = paymentItem.StateOfPayment
+
+		if data, err = OrderPaymentRepository.Save(dm); err != nil {
+			return nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error())
+		}
+	}
+
+	if err = OrderDao.Update(map[string]interface{}{"id": command.OrderId, "orderPaymentAmount": command.TotalPaymentAmount}); err != nil {
+		return
+	}
+
+	return
+}
+
+//// GetOrderPayment 返回合伙人
+//func (OrderPaymentService *OrderPaymentService) GetOrderPayment(command query.GetOrderPaymentQuery) (data *domain.OrderPayment, err error) {
+//	var (
+//		transactionContext, _ = factory.CreateTransactionContext(nil)
+//	)
+//	if err = command.ValidateQuery(); err != nil {
+//		return nil, lib.ThrowError(lib.ARG_ERROR, err.Error())
+//	}
+//	if err := transactionContext.StartTransaction(); err != nil {
+//		return nil, lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
+//	}
+//	defer func() {
+//		transactionContext.RollbackTransaction()
+//	}()
+//	var OrderPaymentRepository domain.OrderPaymentRepository
+//	if OrderPaymentRepository, err = factory.CreateOrderPaymentRepository(map[string]interface{}{
+//		"transactionContext": transactionContext,
+//	}); err != nil {
+//		return nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error())
+//	}
+//	data, err = OrderPaymentRepository.FindOne(domain.PartnerFindOneQuery{UserId: command.Id})
+//	if err != nil {
+//		return nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error())
+//	}
+//	err = transactionContext.CommitTransaction()
+//	return
+//}
+//
+//// 更新客户价值
+//func (OrderPaymentService *OrderPaymentService) UpdateOrderPayment(updateOrderPaymentCommand *command.UpdateOrderPaymentCommand) (err error) {
+//	var (
+//		transactionContext, _ = factory.CreateTransactionContext(nil)
+//	)
+//	if err = updateOrderPaymentCommand.ValidateCommand(); err != nil {
+//		return application.ThrowError(application.ARG_ERROR, err.Error())
+//	}
+//	if err := transactionContext.StartTransaction(); err != nil {
+//		return lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
+//	}
+//	defer func() {
+//		transactionContext.RollbackTransaction()
+//	}()
+//	var OrderPaymentRepository domain.OrderPaymentRepository
+//	if OrderPaymentRepository, err = factory.CreateOrderPaymentRepository(map[string]interface{}{
+//		"transactionContext": transactionContext,
+//	}); err != nil {
+//		return lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
+//	}
+//	OrderPayment, err := OrderPaymentRepository.FindOne(domain.PartnerFindOneQuery{
+//		UserId: updateOrderPaymentCommand.Id,
+//	})
+//	if err != nil {
+//		return lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error())
+//	}
+//	OrderPayment.PartnerCategory = updateOrderPaymentCommand.PartnerCategory
+//	OrderPayment.Salesman = updateOrderPaymentCommand.Salesman
+//	OrderPayment.Status = updateOrderPaymentCommand.Status
+//	OrderPayment.RegionInfo = updateOrderPaymentCommand.RegionInfo
+//	if _, err = OrderPaymentRepository.Save(OrderPayment); err != nil {
+//		return lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error())
+//	}
+//	transactionContext.CommitTransaction()
+//	return
+//}
+//
+// 返回订单支付列表
+func (OrderPaymentService *OrderPaymentService) ListOrderPayment(listOrderPaymentQuery *query.ListOrderPaymentQuery) (int, []*domain.OrderPayment, error) {
+	var (
+		transactionContext, _ = factory.CreateTransactionContext(nil)
+		OrderPayments         []*domain.OrderPayment
+		count                 int
+		err                   error
+	)
+	if err = listOrderPaymentQuery.ValidateQuery(); err != nil {
+		return 0, nil, lib.ThrowError(lib.ARG_ERROR, err.Error())
+	}
+	if err := transactionContext.StartTransaction(); err != nil {
+		return 0, nil, lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
+	}
+	defer func() {
+		if err != nil {
+			transactionContext.RollbackTransaction()
+		}
+	}()
+	var OrderPaymentRepository domain.OrderPaymentRepository
+	if OrderPaymentRepository, err = factory.CreateOrderPaymentRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return 0, nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	queryOption := domain.OrderPaymentQuery{
+		OrderId: listOrderPaymentQuery.OrderId,
+	}
+	if OrderPayments, err = OrderPaymentRepository.Find(queryOption); err != nil {
+		return 0, nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	if count, err = OrderPaymentRepository.CountAll(queryOption); err != nil {
+		return 0, nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	if err = transactionContext.CommitTransaction(); err != nil {
+		return 0, nil, lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
+	}
+	return count, OrderPayments, nil
+}

+package domain
+
+import "time"
+
+const (
+	BonusWaitPay = iota + 1 //等待支付分红
+	BonusPaid               //已经支付分红
+)
+
+type OrderPayment struct {
+	//编号
+	Id int64 `json:"id"`
+	//订单编号
+	OrderId int64 `json:"orderId"`
+	//合伙人编号
+	PartnerId int64 `json:"partnerId"`
+	//支付序号
+	PaymentSn int `json:"paymentSn"`
+	//支付货款
+	PaymentAmount float64 `json:"paymentAmount"`
+	//分红金额
+	BonusAmount float64 `json:"bonusAmount"`
+	//分红状态  1.等待支付分红 2.已支付分红
+	BonusStatus int `json:"bonusStatus"`
+	//创建时间
+	CreateAt time.Time `json:"createAt"`
+	//更新时间
+	UpdateAt time.Time `json:"updateAt"`
+}
+
+func (m *OrderPayment) Identify() interface{} {
+	if m.Id == 0 {
+		return nil
+	}
+	return m.Id
+}
+
+func (m *OrderPayment) Update(data map[string]interface{}) error {
+	if m.BonusStatus != BonusWaitPay {
+		return nil
+	}
+	if paymentAmount, ok := data["paymentAmount"]; ok && paymentAmount != 0 {
+		m.PaymentAmount = paymentAmount.(float64)
+	}
+	if bonusAmount, ok := data["bonusAmount"]; ok && bonusAmount != 0 {
+		m.BonusAmount = bonusAmount.(float64)
+	}
+	if bonusStatus, ok := data["bonusStatus"]; ok && bonusStatus != 0 {
+		m.BonusStatus = bonusStatus.(int)
+	}
+	m.UpdateAt = time.Now()
+	return nil
+}
+
+type OrderPaymentFindOneQuery struct {
+	Id        int64
+	OrderId   int64
+	PaymentSn int
+}
+type OrderPaymentQuery struct {
+	Offset int
+	Limit  int
+
+	OrderId int64
+	//PartnerCategory []int       //合伙人类型
+	//RegionInfo      *RegionInfo //区域
+	//PartnerName     string      //合伙人姓名
+}
+
+type OrderPaymentRepository interface {
+	Save(dm *OrderPayment) (*OrderPayment, error)
+	FindOne(queryOptions OrderPaymentFindOneQuery) (*OrderPayment, error)
+	Find(queryOptions OrderPaymentQuery) ([]*OrderPayment, error)
+	CountAll(queryOptions OrderPaymentQuery) (int, error)
+}

+package dao
+
+import (
+	"fmt"
+	"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg/models"
+	"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg/transaction"
+)
+
+type OrderDao struct {
+	transactionContext *transaction.TransactionContext
+}
+
+func (dao *OrderDao) Update(options map[string]interface{}) (err error) {
+	tx := dao.transactionContext.PgTx
+	order := new(models.Order)
+	q := tx.Model(order)
+	if v, ok := options["orderPaymentAmount"]; ok {
+		q.Set("order_payment_amount = ?", v)
+	}
+	if v, ok := options["id"]; ok {
+		q.Where("id = ?", v)
+	}
+	_, err = q.Update()
+	return
+}
+
+func (dao *OrderDao) GetOrderBaseInfo(id int64) (data map[string]interface{}, err error) {
+	tx := dao.transactionContext.PgTx
+	order := new(models.Order)
+
+	data = make(map[string]interface{})
+	q := tx.Model(order)
+	q.Column("partner_id", "partner_bonus_percent", "order_payment_amount", "buyer")
+	q.Where("id = ?", id)
+	err = q.Select()
+	if err == nil {
+		data["PartnerId"] = order.PartnerId
+		data["PartnerBonusPercent"] = order.PartnerBonusPercent
+		data["OrderPaymentAmount"] = order.OrderPaymentAmount
+		data["Buyer"] = order.Buyer
+	}
+	return
+}
+
+func NewOrderDao(transactionContext *transaction.TransactionContext) (*OrderDao, error) {
+	if transactionContext == nil {
+		return nil, fmt.Errorf("transactionContext参数不能为nil")
+	} else {
+		return &OrderDao{
+			transactionContext: transactionContext,
+		}, nil
+	}
+}

 package models
 package models
 
 
 import (
 import (
-	"time"
-
 	"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain"
 	"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain"
+	"time"
 )
 )
 
 
 type Order struct {
 type Order struct {
-	tableName struct{} `pg:"order,alias:order"`
-	Id        int64    `pg:",pk"`
-	//订单类型
-	OrderType int
+	tableName struct{} `pg:"order"`
+	//id
+	Id int64 `pg:",pk"`
+	//订单类型 1:实际订单 2：意向订单
+	OrderType int `pg:",notnull,default:1"`
 	//订单编号
 	//订单编号
-	OrderCode string
+	OrderCode string `pg:",notnull`
 	//订单名称
 	//订单名称
 	OrderName string
 	OrderName string
 	//订单状态
 	//订单状态
-	OrderStatus int
-	//数量
+	OrderStatus int `pg:",notnull,default:1"`
+	//订单数量
 	OrderCount int
 	OrderCount int
-	//实际数量
+	//实际订单数量
 	OrderActualCount int
 	OrderActualCount int
 	//订单金额
 	//订单金额
-	OrderAmount int
-	//实际订单金额
-	OrderActualAmount int
-	//订单已支付分红金额（货款）
-	OrderPaymentAmount int
+	OrderAmount float64
+	//订单实际金额
+	OrderActualAmount float64
+	//订单已支付金额（货款）
+	OrderPaymentAmount float64
 	//订单区域信息
 	//订单区域信息
 	OrderRegionInfo *domain.RegionInfo
 	OrderRegionInfo *domain.RegionInfo
-	//买家
+
 	Buyer *domain.Buyer
 	Buyer *domain.Buyer
-	//合伙人id
+	//合伙人编号
 	PartnerId int64
 	PartnerId int64
 	//合伙人分红百分比
 	//合伙人分红百分比
 	PartnerBonusPercent float64
 	PartnerBonusPercent float64
 	//业务员分红百分比
 	//业务员分红百分比
 	SalesmanBonusPercent float64
 	SalesmanBonusPercent float64
+
 	//创建时间
 	//创建时间
 	CreateAt time.Time
 	CreateAt time.Time
 	//更新时间
 	//更新时间
 	UpdateAt time.Time
 	UpdateAt time.Time
-	//最后查看得时间
+
+	//上一次查看时间 已读情况
 	LastViewTime time.Time
 	LastViewTime time.Time
 }
 }

+package models
+
+import "time"
+
+type OrderPayment struct {
+	tableName struct{} `pg:"order_payment"`
+	//编号
+	Id int64 `pg:",pk"`
+	//订单编号
+	OrderId int64
+	//合伙人编号
+	PartnerId int64
+	//支付序号
+	PaymentSn int
+	//支付货款
+	PaymentAmount float64 `pg:",notnull,default:0"`
+	//分红金额
+	BonusAmount float64
+	//分红状态  1.等待支付分红 2.已支付分红
+	BonusStatus int `pg:",notnull,default:1"`
+	//创建时间
+	CreateAt time.Time
+	//更新时间
+	UpdateAt time.Time
+}

+package repository
+
+import (
+	"fmt"
+	"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain"
+	"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg/models"
+	"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg/transaction"
+)
+
+type OrderPaymentRepository struct {
+	transactionContext *transaction.TransactionContext
+}
+
+func (repository *OrderPaymentRepository) Save(dm *domain.OrderPayment) (*domain.OrderPayment, error) {
+	var (
+		err error
+		tx  = repository.transactionContext.PgTx
+	)
+	m := &models.OrderPayment{
+		Id:            dm.Id,
+		OrderId:       dm.OrderId,
+		PartnerId:     dm.PartnerId,
+		PaymentAmount: dm.PaymentAmount,
+		BonusAmount:   dm.BonusAmount,
+		BonusStatus:   dm.BonusStatus,
+		CreateAt:      dm.CreateAt,
+		PaymentSn:     dm.PaymentSn,
+		UpdateAt:      dm.UpdateAt,
+	}
+	if m.Id == 0 {
+		err = tx.Insert(m)
+		dm.Id = m.Id
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		err = tx.Update(m)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return dm, nil
+}
+
+func (repository *OrderPaymentRepository) Remove(OrderPayment *domain.OrderPayment) (*domain.OrderPayment, error) {
+	var (
+		tx                = repository.transactionContext.PgTx
+		OrderPaymentModel = &models.OrderPayment{Id: OrderPayment.Identify().(int64)}
+	)
+	if _, err := tx.Model(OrderPaymentModel).Where("id = ?", OrderPayment.Id).Delete(); err != nil {
+		return OrderPayment, err
+	}
+	return OrderPayment, nil
+}
+
+func (repository *OrderPaymentRepository) FindOne(queryOptions domain.OrderPaymentFindOneQuery) (*domain.OrderPayment, error) {
+	tx := repository.transactionContext.PgTx
+	OrderPaymentModel := new(models.OrderPayment)
+	query := tx.Model(OrderPaymentModel)
+
+	if queryOptions.OrderId > 0 {
+		query.Where("order_payment.order_id = ?", queryOptions.OrderId)
+	}
+	if queryOptions.PaymentSn > 0 {
+		query.Where("order_payment.payment_sn = ?", queryOptions.PaymentSn)
+	}
+	if err := query.First(); err != nil {
+		return nil, err
+	}
+	if OrderPaymentModel.Id == 0 {
+		return nil, nil
+	}
+	return repository.transformPgModelToDomainModel(OrderPaymentModel)
+}
+
+func (repository *OrderPaymentRepository) Find(queryOptions domain.OrderPaymentQuery) ([]*domain.OrderPayment, error) {
+	tx := repository.transactionContext.PgTx
+	var OrderPaymentModels []*models.OrderPayment
+	query := tx.Model(&OrderPaymentModels)
+	query.Where("order_payment.order_id = ?", queryOptions.OrderId)
+	var (
+		err error
+		rsp = make([]*domain.OrderPayment, 0)
+	)
+	err = query.Select()
+	if err != nil {
+		return rsp, err
+	}
+	for i := range OrderPaymentModels {
+		dm, err := repository.transformPgModelToDomainModel(OrderPaymentModels[i])
+		if err != nil {
+			return rsp, err
+		}
+		rsp = append(rsp, dm)
+	}
+	return rsp, nil
+}
+
+func (repository OrderPaymentRepository) CountAll(queryOption domain.OrderPaymentQuery) (int, error) {
+	db := repository.transactionContext.PgDd
+	partnerModels := models.PartnerInfo{}
+	query := db.Model(&partnerModels)
+	//if len(queryOption.PartnerName) > 0 {
+	//	query = query.Where("partner_name like ?", "%"+queryOption.PartnerName+"%")
+	//}
+	//if queryOption.RegionInfo != nil {
+	//	query = query.Where("region_info::jsonb->>'regionName' like ?", "%"+queryOption.RegionInfo.RegionName+"%")
+	//}
+	//if len(queryOption.PartnerCategory) > 0 {
+	//	query = query.WhereIn("partner_category in(?)", queryOption.PartnerCategory)
+	//}
+	cnt, err := query.Count()
+	return cnt, err
+}
+
+func (repository *OrderPaymentRepository) transformPgModelToDomainModel(dm *models.OrderPayment) (*domain.OrderPayment, error) {
+	m := &domain.OrderPayment{
+		Id:            dm.Id,
+		OrderId:       dm.OrderId,
+		PartnerId:     dm.PartnerId,
+		PaymentAmount: dm.PaymentAmount,
+		BonusAmount:   dm.BonusAmount,
+		BonusStatus:   dm.BonusStatus,
+		PaymentSn:     dm.PaymentSn,
+		CreateAt:      dm.CreateAt,
+		UpdateAt:      dm.UpdateAt,
+	}
+	return m, nil
+}
+
+func NewOrderPaymentRepository(transactionContext *transaction.TransactionContext) (*OrderPaymentRepository, error) {
+	if transactionContext == nil {
+		return nil, fmt.Errorf("transactionContext参数不能为nil")
+	}
+	return &OrderPaymentRepository{transactionContext: transactionContext}, nil
+}

+package utils
+
+import (
+	"github.com/shopspring/decimal"
+	"math"
+	"math/rand"
+	"time"
+)
+
+func decimal1(value float64) float64 {
+	return math.Trunc(value*1e1+0.5) * 1e-1
+}
+
+func Round(value float64, places int32) float64 {
+	quantity := decimal.NewFromFloat(value)
+	d := quantity.Round(places)
+	rsp, _ := d.Float64()
+	return rsp
+}
+
+func Decimal(value float64) float64 {
+	return Round(value, 2)
+}
+
+func DecimalToNumber(value float64) float64 {
+	return Round(value, 2)
+}
+
+func GenerateRangeNum(min, max int) int {
+	rand.Seed(time.Now().Unix())
+	randNum := rand.Intn(max-min) + min
+	return randNum
+}

+package controllers
+
+import (
+	"errors"
+	"github.com/astaxie/beego/logs"
+	OrderPaymentCmd "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/order_payment/command"
+	OrderPaymentQuery "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/order_payment/query"
+	OrderPaymentSvr "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/order_payment/service"
+	"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain"
+	"strconv"
+)
+
+type DividendsController struct {
+	BaseController
+}
+
+////Prepare 重写 BaseController 的Prepare方法
+func (c *DividendsController) Prepare() {
+	c.BaseController.Prepare()
+	//if ok := c.ValidJWTToken(); !ok {
+	//	return
+	//}
+	//if ok := c.ValidAdminPermission(domain.PERMINSSION_PARTNER); !ok {
+	//	return
+	//}
+}
+
+//Edit 编辑分红支付
+func (c *DividendsController) Edit() {
+	//用与适配前端定义的数据结构
+	type DividendPaymentItem struct {
+		PaymentForGoods string `json:"paymentForGoods"`
+		StateOfPayment  string `json:"stateOfPayment"`
+	}
+	type Parameter struct {
+		Id              int64                 `json:"id"` //订单编号
+		DividendPayment []DividendPaymentItem `json:"dividendPayment"`
+	}
+	var (
+		param Parameter
+		err   error
+	)
+	if err = c.BindJsonData(&param); err != nil {
+		logs.Error(err)
+		c.ResponseError(errors.New("json数据解析失败"))
+		return
+	}
+	cmd := OrderPaymentCmd.CreateOrderPaymentCommand{
+		OrderId:            param.Id,
+		DivdendPaymentItem: make([]OrderPaymentCmd.DivdendPyamentItem, 0),
+	}
+
+	//编辑
+	for i := range param.DividendPayment {
+		item := param.DividendPayment[i]
+		paymentItem := OrderPaymentCmd.DivdendPyamentItem{}
+		paymentItem.PaymentForGoods, _ = strconv.ParseFloat(item.PaymentForGoods, 64)
+		paymentItem.StateOfPayment, _ = strconv.Atoi(item.StateOfPayment)
+		paymentItem.PaymentSn = i + 1
+
+		if paymentItem.StateOfPayment == domain.BonusPaid {
+			cmd.TotalPaymentAmount += paymentItem.PaymentForGoods
+		}
+		cmd.DivdendPaymentItem = append(cmd.DivdendPaymentItem, paymentItem)
+	}
+	serve := OrderPaymentSvr.NewOrderPaymentService(nil)
+	_, err = serve.CreateOrderPayment(&cmd)
+	if err != nil {
+		c.ResponseError(err)
+		return
+	}
+	c.ResponseData(nil)
+	return
+}
+
+//Edit 分红支付详情
+func (c *DividendsController) Detail() {
+	type Parameter struct {
+		Id int64 `json:"id"` //订单编号
+	}
+	var (
+		param Parameter
+		err   error
+	)
+	if err = c.BindJsonData(&param); err != nil {
+		logs.Error(err)
+		c.ResponseError(errors.New("json数据解析失败"))
+		return
+	}
+
+	cmd := OrderPaymentQuery.ListOrderPaymentQuery{
+		OrderId: param.Id,
+	}
+	serve := OrderPaymentSvr.NewOrderPaymentService(nil)
+	var data []*domain.OrderPayment
+	_, data, err = serve.ListOrderPayment(&cmd)
+	if err != nil {
+		c.ResponseError(err)
+		return
+	}
+
+	type DividendPayment struct {
+		PaymentForGoods    float64 `json:"paymentForGoods"`
+		UpdateTime         string  `json:"updateTime"`
+		StateOfPayment     int     `json:"stateOfPayment"`
+		Dividend           float64 `json:"dividend"`
+		DividendProportion float64 `json:"dividendProportion"`
+	}
+	type Response struct {
+		DividendPayment []DividendPayment `json:"dividendPayment"`
+	}
+	rsp := Response{DividendPayment: make([]DividendPayment, 0)}
+	for i := range data {
+		item := data[i]
+		payment := DividendPayment{
+			PaymentForGoods:    item.PaymentAmount,
+			UpdateTime:         item.UpdateAt.Format("2006-01-02 15:04:05"),
+			StateOfPayment:     item.BonusStatus,
+			Dividend:           item.BonusAmount,
+			DividendProportion: 2,
+		}
+		rsp.DividendPayment = append(rsp.DividendPayment, payment)
+	}
+
+	c.ResponseData(rsp)
+	return
+}

@@ -27,6 +27,10 @@ func init() {
 			beego.NSRouter("/detail", &controllers.PartnerInfoController{}, "POST:GetPartnerInfo"),
 			beego.NSRouter("/detail", &controllers.PartnerInfoController{}, "POST:GetPartnerInfo"),
 			beego.NSRouter("/set-status", &controllers.PartnerInfoController{}, "POST:PartnerInfoSetState"),
 			beego.NSRouter("/set-status", &controllers.PartnerInfoController{}, "POST:PartnerInfoSetState"),
 		),
 		),
+		beego.NSNamespace("/dividends",
+			beego.NSRouter("/edit", &controllers.DividendsController{}, "POST:Edit"),
+			beego.NSRouter("/detail", &controllers.DividendsController{}, "POST:Detail"),
+		),
 	)
 	)
 	beego.AddNamespace(adminRouter)
 	beego.AddNamespace(adminRouter)
 }
 }