fix:修复分红订单备注字段问题

@@ -670,16 +670,12 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
 			}
 		}
 
-		dividendsEstimatesSaved, err := dividendsEstimateRepository.SaveMany(dividendsEstimates)
-		if err != nil {
-			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
-		}
 		if err := transactionContext.CommitTransaction(); err != nil {
 			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		}
 		// TODO 分析成功和失败原因
 
-		return dividendsEstimatesSaved, nil
+		return dividendsEstimatesSavedSuccessfully, nil
 	}
 }
 

@@ -2,14 +2,26 @@ package command
 
 import (
 	"fmt"
+	"github.com/beego/beego/v2/core/validation"
 	"reflect"
 	"strings"
 	"time"
-
-	"github.com/beego/beego/v2/core/validation"
 )
 
 type ImportDividendsOrderCommand struct {
+	// 订单数据列表
+	DividendsOrderData []*DividendsOrderData `cname:"订单数据列表" json:"dividendsOrderData" valid:"Required"`
+	// 公司ID，通过集成REST上下文获取
+	CompanyId int64 `cname:"公司ID" json:"companyId"`
+	// 组织机构ID
+	OrgId int64 `cname:"组织机构ID" json:"orgId"`
+	// 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
+	UserId int64 `cname:"用户ID" json:"userId"`
+	// 用户基础信息id
+	UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId"`
+}
+
+type DividendsOrderData struct {
 	// 客户名称
 	CustomerName string `cname:"客户名称" json:"customerName" valid:"Required"`
 	// 分红订单金额
@@ -20,24 +32,16 @@ type ImportDividendsOrderCommand struct {
 	DividendsOriginalOrderNum string `cname:"分红订单原单号" json:"dividendsOriginalOrderNum" valid:"Required"`
 	// 订单产生时间
 	OrderTime time.Time `cname:"订单产生时间" json:"orderTime" valid:"Required"`
-	// 备注
-	Remarks string `cname:"备注" json:"remarks" valid:"Required"`
 	// 订单区域名称
 	RegionName string `cname:"订单区域名称" json:"regionName,omitempty"`
 	// 订单业务员uid
 	SalesmanUid string `cname:"订单业务员UID" json:"salesmanUid,omitempty"`
-	// 订单操作人uid
-	OperatorUid string `cname:"订单操作人UID" json:"operatorUid,omitempty"`
 	// 订单产品列表
 	OrderGoods []*OrderGoods `cname:"订单产品列表" json:"orderGoods,omitempty"`
-	// 公司ID，通过集成REST上下文获取
-	CompanyId int64 `cname:"公司ID" json:"companyId" valid:"Required"`
-	// 组织机构ID
-	OrgId int64 `cname:"组织机构ID" json:"orgId" valid:"Required"`
-	// 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
-	UserId int64 `cname:"用户ID" json:"userId" valid:"Required"`
-	// 用户基础信息id
-	UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId" valid:"Required"`
+	// 订单操作人uid
+	OperatorUid string `cname:"订单操作人UID" json:"operatorUid,omitempty"`
+	// 备注
+	Remarks string `cname:"备注" json:"remarks,omitempty"`
 }
 
 func (importDividendsOrderCommand *ImportDividendsOrderCommand) Valid(validation *validation.Validation) {

@@ -162,6 +162,7 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD
 		UpdatedAt:    time.Time{},
 		OperateTime:  time.Now(),
 		Operator:     operator,
+		Remarks:      createDividendsOrderCommand.Remarks,
 	}
 
 	// 分红订单仓储初始化
@@ -183,6 +184,174 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD
 	}
 }
 
+// ImportDividendsOrder 导入分红订单实体对象
+func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importDividendsOrderCommand *command.ImportDividendsOrderCommand) (interface{}, error) {
+	if err := importDividendsOrderCommand.ValidateCommand(); err != nil {
+		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
+	}
+	transactionContext, err := factory.CreateTransactionContext(nil)
+	if err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	if err := transactionContext.StartTransaction(); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	defer func() {
+		_ = transactionContext.RollbackTransaction()
+	}()
+
+	// 公司REST服务初始化
+	var companyService service.CompanyService
+	if value, err := factory.CreateCompanyService(map[string]interface{}{}); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		companyService = value
+	}
+
+	// 获取公司信息
+	var company *domain.Company
+	if data, err := companyService.CompanyFrom(importDividendsOrderCommand.CompanyId); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		company = data
+	}
+
+	// 组织机构REST服务初始化
+	var organizationService service.OrgService
+	if value, err := factory.CreateOrganizationService(map[string]interface{}{}); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		organizationService = value
+	}
+
+	// 获取组织机构信息
+	var organization *domain.Org
+	if data, err := organizationService.OrgFrom(importDividendsOrderCommand.CompanyId, importDividendsOrderCommand.OrgId); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		organization = data
+	}
+
+	// 用户REST服务初始化
+	var userService service.UserService
+	if value, err := factory.CreateUserService(map[string]interface{}{}); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		userService = value
+	}
+
+	// 获取操作人
+	var operator *domain.User
+	if data, err := userService.OperatorFrom(importDividendsOrderCommand.CompanyId, importDividendsOrderCommand.OrgId, importDividendsOrderCommand.UserId); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		operator = data
+	}
+
+	// 分红订单DAO初始化
+	var dividendsOrderDao *dao.DividendsOrderDao
+	if value, err := factory.CreateDividendsOrderDao(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	} else {
+		dividendsOrderDao = value
+	}
+
+	var dividendsOrderImportFailed []*domain.DividendsOrder
+	var dividendsOrderImportSuccesfully []*domain.DividendsOrder
+
+	for _, dividendsOrder := range importDividendsOrderCommand.DividendsOrderData {
+		// 生成分红订单号
+		dividendsOrderNumber, err := dividendsOrderDao.GenerateDividendsOrderNumber()
+		if err != nil {
+			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+		}
+
+		// 校验分红订单编号是否唯一
+		numberAvailable, err := dividendsOrderDao.CheckDividendsOrderNumberAvailable(map[string]interface{}{
+			"companyId":            importDividendsOrderCommand.CompanyId,
+			"orgId":                importDividendsOrderCommand.OrgId,
+			"dividendsOrderNumber": dividendsOrderNumber,
+		})
+		if err != nil {
+			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+		}
+		if !numberAvailable {
+			return nil, application.ThrowError(application.TRANSACTION_ERROR, "新增分红订单异常")
+		}
+
+		// 新增订单产品
+		var orderGoods []*domain.OrderGood
+		var dividendsOrderAmount float64
+		for _, orderGood := range dividendsOrder.OrderGoods {
+			orderGoods = append(orderGoods, &domain.OrderGood{
+				OrderGoodId:                  0,
+				OrderGoodAmount:              orderGood.OrderGoodAmount,
+				OrderGoodName:                orderGood.OrderGoodName,
+				OrderGoodPrice:               orderGood.OrderGoodPrice,
+				OrderGoodQuantity:            orderGood.OrderGoodQuantity,
+				DividendsOrderNumber:         dividendsOrderNumber,
+				DividendsReturnedOrderNumber: "",
+				CooperationContractNumber:    orderGood.CooperationContractNumber,
+				OrderGoodExpense:             orderGood.OrderGoodExpense,
+				OrgId:                        importDividendsOrderCommand.OrgId,
+				CompanyId:                    importDividendsOrderCommand.CompanyId,
+				CreatedAt:                    time.Time{},
+				DeletedAt:                    time.Time{},
+				UpdatedAt:                    time.Time{},
+			})
+			// 计算分红订单金额
+			dividendsOrderAmount = dividendsOrderAmount + orderGood.OrderGoodAmount
+		}
+
+		// 新增分红订单
+		newDividendsOrder := &domain.DividendsOrder{
+			DividendsOrderId:          0,
+			DividendsOrderNumber:      dividendsOrderNumber,
+			DividendsOriginalOrderNum: dividendsOrder.DividendsOriginalOrderNum,
+			DividendsOrderAmount:      dividendsOrderAmount,
+			OrderTime:                 dividendsOrder.OrderTime,
+			DividendTime:              time.Time{},
+			DividendStatus:            domain.TO_BE_DIVIDEND,
+			Region: &domain.RegionInfo{
+				RegionNumber: "",
+				RegionName:   dividendsOrder.RegionName,
+			},
+			CustomerName: dividendsOrder.CustomerName,
+			Goods:        orderGoods,
+			Org:          organization,
+			Company:      company,
+			CreatedAt:    time.Now(),
+			DeletedAt:    time.Time{},
+			UpdatedAt:    time.Time{},
+			OperateTime:  time.Now(),
+			Operator:     operator,
+		}
+
+		// 分红订单仓储初始化
+		var dividendsOrderRepository domain.DividendsOrderRepository
+		if value, err1 := factory.CreateDividendsOrderRepository(map[string]interface{}{
+			"transactionContext": transactionContext,
+		}); err1 != nil {
+			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err1.Error())
+		} else {
+			dividendsOrderRepository = value
+		}
+		if dividendsOrderSaved, err2 := dividendsOrderRepository.Save(newDividendsOrder); err2 != nil {
+			dividendsOrderImportFailed = append(dividendsOrderImportFailed, newDividendsOrder)
+			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err2.Error())
+		} else {
+			dividendsOrderImportSuccesfully = append(dividendsOrderImportSuccesfully, dividendsOrderSaved)
+			return dividendsOrderSaved, nil
+		}
+	}
+	if err3 := transactionContext.CommitTransaction(); err3 != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err3.Error())
+	}
+	return nil, nil
+}
+
 // GetDividendsOrder 返回分红订单实体对象
 func (dividendsOrderService *DividendsOrderService) GetDividendsOrder(getDividendsOrderQuery *query.GetDividendsOrderQuery) (interface{}, error) {
 	if err := getDividendsOrderQuery.ValidateQuery(); err != nil {

@@ -2,36 +2,41 @@ package command
 
 import (
 	"fmt"
+	"github.com/beego/beego/v2/core/validation"
 	"reflect"
 	"strings"
 	"time"
-
-	"github.com/beego/beego/v2/core/validation"
 )
 
-type ImportDividendsReturnedOrderCommand struct {
+// DividendsReturnedOrderData 分红退货单数据
+type DividendsReturnedOrderData struct {
 	// 退货金额
 	DividendsReturnedOrderRefund float64 `cname:"退货金额" json:"dividendsReturnedOrderRefund" valid:"Required"`
 	// 退货客户名称
 	DividendsReturnedCustomerName string `cname:"退货客户名称" json:"dividendsReturnedCustomerName" valid:"Required"`
 	// 来源单号，源单号，订单号
 	OriginalOrderNum string `cname:"来源单号" json:"originalOrderNum" valid:"Required"`
-	// 备注
-	Remarks string `cname:"备注" json:"remarks" valid:"Required"`
 	// 退货日期
 	DividendsReturnedDate time.Time `cname:"退货日期" json:"dividendsReturnedDate" valid:"Required"`
 	// 退货区域名称
-	RegionName string `cname:"退货区域名称" json:"regionName,omitempty"`
+	RegionName string `cname:"退货区域名称" json:"regionName"`
 	// 订单产品列表
-	OrderGoods []*OrderGoods `cname:"订单产品列表" json:"orderGoods,omitempty"`
+	OrderGoods []*OrderGoods `cname:"订单产品列表" json:"orderGoods"`
+	// 备注
+	Remarks string `cname:"备注" json:"remarks"`
+}
+
+type ImportDividendsReturnedOrderCommand struct {
+	// 分红退货单数据
+	DividendsReturnedOrderData []*DividendsReturnedOrderData `cname:"分红退货单数据列表" json:"dividendsReturnedOrderData" valid:"Required"`
 	// 公司ID，通过集成REST上下文获取
-	CompanyId int64 `cname:"公司ID" json:"companyId" valid:"Required"`
+	CompanyId int64 `cname:"公司ID" json:"companyId"`
 	// 组织机构ID
-	OrgId int64 `cname:"组织机构ID" json:"orgId" valid:"Required"`
+	OrgId int64 `cname:"组织机构ID" json:"orgId"`
 	// 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
-	UserId int64 `cname:"用户ID" json:"userId" valid:"Required"`
+	UserId int64 `cname:"用户ID" json:"userId"`
 	// 用户基础数据id
-	UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId" valid:"Required"`
+	UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId"`
 }
 
 func (importDividendsReturnedOrderCommand *ImportDividendsReturnedOrderCommand) Valid(validation *validation.Validation) {

@@ -131,7 +131,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDivide
 
 	newDividendsReturnedOrder := &domain.DividendsReturnedOrder{
 		DividendsReturnedOrderNumber:  dividendsReturnedOrderNumber,
-		DividendsReturnedOrderRefund:  0,
+		DividendsReturnedOrderRefund:  createDividendsReturnedOrderCommand.DividendsReturnedOrderRefund,
 		OriginalOrderNum:              createDividendsReturnedOrderCommand.OriginalOrderNum,
 		DividendsOrderNumber:          createDividendsReturnedOrderCommand.DividendsOrderNumber,
 		DividendsReturnedCustomerName: createDividendsReturnedOrderCommand.DividendsReturnedCustomerName,

@@ -23,6 +23,19 @@ func (controller *DividendsOrderController) CreateDividendsOrder() {
 	controller.Response(data, err)
 }
 
+func (controller *DividendsOrderController) ImportDividendsOrder() {
+	dividendsOrderService := service.NewDividendsOrderService(nil)
+	importDividendsOrderCommand := &command.ImportDividendsOrderCommand{}
+	_ = controller.Unmarshal(importDividendsOrderCommand)
+	header := controller.GetRequestHeader(controller.Ctx)
+	importDividendsOrderCommand.CompanyId = header.CompanyId
+	importDividendsOrderCommand.OrgId = header.OrgId
+	importDividendsOrderCommand.UserId = header.UserId
+	importDividendsOrderCommand.UserBaseId = header.UserBaseId
+	data, err := dividendsOrderService.ImportDividendsOrder(importDividendsOrderCommand)
+	controller.Response(data, err)
+}
+
 func (controller *DividendsOrderController) UpdateDividendsOrder() {
 	dividendsOrderService := service.NewDividendsOrderService(nil)
 	updateDividendsOrderCommand := &command.UpdateDividendsOrderCommand{}