合并分支 'dev' 到 'test'

Dev



查看合并请求 !73

@@ -26,6 +26,8 @@ type OneClickApprovalCooperationApplicationCommand struct {
 	CooperationApplicationStatus int32 `cname:"共创申请审核状态" json:"cooperationApplicationStatus"`
 	CooperationApplicationStatus int32 `cname:"共创申请审核状态" json:"cooperationApplicationStatus"`
 	//	查询限制
 	//	查询限制
 	OffsetLimit bool `cname:"查询限制" json:"offsetLimit"`
 	OffsetLimit bool `cname:"查询限制" json:"offsetLimit"`
+	//	是否取消标志
+	IsCanceled int32 `cname:"是否删除" json:"isCanceled"`
 }
 }
 
 
 func (oneClickApprovalCooperationApplicationCommand *OneClickApprovalCooperationApplicationCommand) Valid(validation *validation.Validation) {
 func (oneClickApprovalCooperationApplicationCommand *OneClickApprovalCooperationApplicationCommand) Valid(validation *validation.Validation) {

@@ -445,7 +445,7 @@ func (cooperationApplicationService *CooperationApplicationService) OneClickAppr
 	// 获取审核人
 	// 获取审核人
 	var verifier *domain.User
 	var verifier *domain.User
 	if data, err := userService.UserFrom(oneClickApprovalCooperationApplicationCommand.CompanyId, oneClickApprovalCooperationApplicationCommand.OrgId, oneClickApprovalCooperationApplicationCommand.UserId); err != nil {
 	if data, err := userService.UserFrom(oneClickApprovalCooperationApplicationCommand.CompanyId, oneClickApprovalCooperationApplicationCommand.OrgId, oneClickApprovalCooperationApplicationCommand.UserId); err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取申请人失败")
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取审核人失败")
 	} else {
 	} else {
 		verifier = data
 		verifier = data
 	}
 	}
@@ -453,6 +453,10 @@ func (cooperationApplicationService *CooperationApplicationService) OneClickAppr
 	// 查询共创申请
 	// 查询共创申请
 	oneClickApprovalCooperationApplicationCommand.CooperationApplicationStatus = 1 // 待审核
 	oneClickApprovalCooperationApplicationCommand.CooperationApplicationStatus = 1 // 待审核
 	oneClickApprovalCooperationApplicationCommand.OffsetLimit = false
 	oneClickApprovalCooperationApplicationCommand.OffsetLimit = false
+	oneClickApprovalCooperationApplicationCommand.IsCanceled = int32(1)
+	oneClickApprovalCooperationApplicationCommand.UserBaseId = 0
+	oneClickApprovalCooperationApplicationCommand.UserId = 0
+
 	if count, cooperationApplications, err := cooperationApplicationRepository.Find(tool_funs.SimpleStructToMap(oneClickApprovalCooperationApplicationCommand)); err != nil {
 	if count, cooperationApplications, err := cooperationApplicationRepository.Find(tool_funs.SimpleStructToMap(oneClickApprovalCooperationApplicationCommand)); err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	} else {
 	} else {

@@ -160,7 +160,6 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst
 					}); err4 != nil {
 					}); err4 != nil {
 						return nil, err4
 						return nil, err4
 					} else {
 					} else {
-
 						if countDividendsOrder > 0 {
 						if countDividendsOrder > 0 {
 							for i, order := range orders {
 							for i, order := range orders {
 								// 取消分红的订单产品
 								// 取消分红的订单产品
@@ -230,7 +229,7 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst
 						if countDividendsReturnedOrder > 0 {
 						if countDividendsReturnedOrder > 0 {
 							for i, returnedOrder := range returnedOrders {
 							for i, returnedOrder := range returnedOrders {
 								// 已取消的退货单产品
 								// 已取消的退货单产品
-								newReturnedOrderGoodIds := utils.RemoveDuplicationInt64(orderGoodMaps[returnedOrder.DividendsOrderNumber])
+								newReturnedOrderGoodIds := utils.RemoveDuplicationInt64(orderGoodMaps[returnedOrder.DividendsReturnedOrderNumber])
 								var goodIds []int64
 								var goodIds []int64
 								for _, good := range returnedOrder.Goods {
 								for _, good := range returnedOrder.Goods {
 									if good.OrderGoodDividendsStatus == 2 {
 									if good.OrderGoodDividendsStatus == 2 {