allied-creation / allied-creation-cooperation · 提交

转到一个项目

作者 陈志颖
提交 b09d03ecffa4f5751f5d01de7d277e42a8038229 1 个父辈 67c87811

fix:取消分红预算单调整

内嵌 并排对比
正在显示 4 个修改的文件 包含 64 行增加 和 48 行删除
@@ -145,6 +145,10 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD @@ -145,6 +145,10 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD
145 } 145 }
146 } 146 }
147 147
  148 + log.Logger.Info("查询到的合约", map[string]interface{}{
  149 + "cooperationContractsMap": cooperationContractsMap,
  150 + })
  151 +
148 // 订单时间转换 152 // 订单时间转换
149 orderTimeInt, err := strconv.ParseInt(createDividendsOrderCommand.OrderTime, 10, 64) 153 orderTimeInt, err := strconv.ParseInt(createDividendsOrderCommand.OrderTime, 10, 64)
150 if err != nil { 154 if err != nil {
@@ -163,9 +167,14 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD @@ -163,9 +167,14 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD
163 ruleMatchedFlag := false 167 ruleMatchedFlag := false
164 if orderGood.CooperationContractNumber != "" { 168 if orderGood.CooperationContractNumber != "" {
165 // 校验共创合约激励类型是否正确 169 // 校验共创合约激励类型是否正确
166 - if cooperationContractsMap[orderGood.CooperationContractNumber] != nil && cooperationContractsMap[orderGood.CooperationContractNumber].IncentivesType != 1 {  
167 - return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "分红订单产品不能关联金额激励规则") 170 + if cooperationContractsMap[orderGood.CooperationContractNumber] != nil {
  171 + if cooperationContractsMap[orderGood.CooperationContractNumber].IncentivesType != 1 {
  172 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "分红订单产品不能关联金额激励规则")
  173 + }
  174 + } else {
  175 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创合约不存在")
168 } 176 }
  177 +
169 // 校验产品关联合约的激励规则是否匹配订单时间 178 // 校验产品关联合约的激励规则是否匹配订单时间
170 if cooperationContractsMap[orderGood.CooperationContractNumber] != nil { 179 if cooperationContractsMap[orderGood.CooperationContractNumber] != nil {
171 for _, incentivesRule := range cooperationContractsMap[orderGood.CooperationContractNumber].DividendsIncentivesRules { 180 for _, incentivesRule := range cooperationContractsMap[orderGood.CooperationContractNumber].DividendsIncentivesRules {
@@ -44,7 +44,7 @@ type DividendsEstimate struct { @@ -44,7 +44,7 @@ type DividendsEstimate struct {
44 // 操作时间 44 // 操作时间
45 OperateTime time.Time `comment:"操作时间"` 45 OperateTime time.Time `comment:"操作时间"`
46 // 取消状态 46 // 取消状态
47 - IsCanceled bool `comment:"取消状态" pg:",use_zero,default:false"` 47 + IsCanceled bool `comment:"取消状态" pg:",use_zero"`
48 // 产品ID 48 // 产品ID
49 OrderGoodId int64 `comment:"产品ID"` 49 OrderGoodId int64 `comment:"产品ID"`
50 // 创建时间 50 // 创建时间
@@ -48,6 +48,7 @@ func (repository *DividendsEstimateRepository) Save(dividendsEstimate *domain.Di @@ -48,6 +48,7 @@ func (repository *DividendsEstimateRepository) Save(dividendsEstimate *domain.Di
48 "created_at", 48 "created_at",
49 "deleted_at", 49 "deleted_at",
50 "updated_at", 50 "updated_at",
  51 + "cooperation_contract_undertaker_id",
51 } 52 }
52 insertFieldsSnippet := sqlbuilder.SqlFieldsSnippet(sqlBuildFields) 53 insertFieldsSnippet := sqlbuilder.SqlFieldsSnippet(sqlBuildFields)
53 insertPlaceHoldersSnippet := sqlbuilder.SqlPlaceHoldersSnippet(sqlBuildFields) 54 insertPlaceHoldersSnippet := sqlbuilder.SqlPlaceHoldersSnippet(sqlBuildFields)
@@ -86,6 +87,7 @@ func (repository *DividendsEstimateRepository) Save(dividendsEstimate *domain.Di @@ -86,6 +87,7 @@ func (repository *DividendsEstimateRepository) Save(dividendsEstimate *domain.Di
86 &dividendsEstimate.CreatedAt, 87 &dividendsEstimate.CreatedAt,
87 &dividendsEstimate.DeletedAt, 88 &dividendsEstimate.DeletedAt,
88 &dividendsEstimate.UpdatedAt, 89 &dividendsEstimate.UpdatedAt,
  90 + &dividendsEstimate.CooperationContractUndertakerId,
89 ), 91 ),
90 fmt.Sprintf("INSERT INTO dividends_estimates (%s) VALUES (%s) RETURNING %s", insertFieldsSnippet, insertPlaceHoldersSnippet, returningFieldsSnippet), 92 fmt.Sprintf("INSERT INTO dividends_estimates (%s) VALUES (%s) RETURNING %s", insertFieldsSnippet, insertPlaceHoldersSnippet, returningFieldsSnippet),
91 dividendsEstimate.DividendsEstimateId, 93 dividendsEstimate.DividendsEstimateId,
@@ -110,6 +112,7 @@ func (repository *DividendsEstimateRepository) Save(dividendsEstimate *domain.Di @@ -110,6 +112,7 @@ func (repository *DividendsEstimateRepository) Save(dividendsEstimate *domain.Di
110 dividendsEstimate.CreatedAt, 112 dividendsEstimate.CreatedAt,
111 nil, 113 nil,
112 dividendsEstimate.UpdatedAt, 114 dividendsEstimate.UpdatedAt,
  115 + dividendsEstimate.CooperationContractUndertakerId,
113 ); err != nil { 116 ); err != nil {
114 return dividendsEstimate, err 117 return dividendsEstimate, err
115 } 118 }
@@ -138,6 +141,7 @@ func (repository *DividendsEstimateRepository) Save(dividendsEstimate *domain.Di @@ -138,6 +141,7 @@ func (repository *DividendsEstimateRepository) Save(dividendsEstimate *domain.Di
138 &dividendsEstimate.CreatedAt, 141 &dividendsEstimate.CreatedAt,
139 &dividendsEstimate.DeletedAt, 142 &dividendsEstimate.DeletedAt,
140 &dividendsEstimate.UpdatedAt, 143 &dividendsEstimate.UpdatedAt,
  144 + &dividendsEstimate.CooperationContractUndertakerId,
141 ), 145 ),
142 fmt.Sprintf("UPDATE dividends_estimates SET %s WHERE dividends_estimate_id=? RETURNING %s", updateFieldsSnippet, returningFieldsSnippet), 146 fmt.Sprintf("UPDATE dividends_estimates SET %s WHERE dividends_estimate_id=? RETURNING %s", updateFieldsSnippet, returningFieldsSnippet),
143 dividendsEstimate.DividendsEstimateId, 147 dividendsEstimate.DividendsEstimateId,
@@ -162,6 +166,7 @@ func (repository *DividendsEstimateRepository) Save(dividendsEstimate *domain.Di @@ -162,6 +166,7 @@ func (repository *DividendsEstimateRepository) Save(dividendsEstimate *domain.Di
162 dividendsEstimate.CreatedAt, 166 dividendsEstimate.CreatedAt,
163 nil, 167 nil,
164 dividendsEstimate.UpdatedAt, 168 dividendsEstimate.UpdatedAt,
  169 + dividendsEstimate.CooperationContractUndertakerId,
165 dividendsEstimate.Identify(), 170 dividendsEstimate.Identify(),
166 ); err != nil { 171 ); err != nil {
167 return dividendsEstimate, err 172 return dividendsEstimate, err
@@ -183,28 +188,29 @@ func (repository *DividendsEstimateRepository) SaveMany(dividendsEstimates []*do @@ -183,28 +188,29 @@ func (repository *DividendsEstimateRepository) SaveMany(dividendsEstimates []*do
183 } 188 }
184 } 189 }
185 dividendsEstimateModels = append(dividendsEstimateModels, &models.DividendsEstimate{ 190 dividendsEstimateModels = append(dividendsEstimateModels, &models.DividendsEstimate{
186 - DividendsEstimateId: dividendsEstimate.DividendsEstimateId,  
187 - DividendsAccountStatus: dividendsEstimate.DividendsAccountStatus,  
188 - PaymentStatus: dividendsEstimate.PaymentStatus,  
189 - DividendsAmount: dividendsEstimate.DividendsAmount,  
190 - DividendsEstimateOrderNumber: dividendsEstimate.DividendsEstimateOrderNumber,  
191 - DividendsEstimateTime: dividendsEstimate.DividendsEstimateTime,  
192 - DividendsParticipateType: dividendsEstimate.DividendsParticipateType,  
193 - DividendsType: dividendsEstimate.DividendsType,  
194 - DividendsTypeName: dividendsEstimate.DividendsTypeName,  
195 - OrderOrReturnedOrderNum: dividendsEstimate.OrderOrReturnedOrderNum,  
196 - CooperationContractNumber: dividendsEstimate.CooperationContractNumber,  
197 - DividendsUser: dividendsEstimate.DividendsUser,  
198 - DividendsStage: dividendsEstimate.DividendsStage,  
199 - Org: dividendsEstimate.Org,  
200 - Company: dividendsEstimate.Company,  
201 - Operator: dividendsEstimate.Operator,  
202 - OperateTime: dividendsEstimate.OperateTime,  
203 - IsCanceled: dividendsEstimate.IsCanceled,  
204 - OrderGoodId: dividendsEstimate.OrderGoodId,  
205 - CreatedAt: dividendsEstimate.CreatedAt,  
206 - DeletedAt: dividendsEstimate.DeletedAt,  
207 - UpdatedAt: dividendsEstimate.UpdatedAt, 191 + DividendsEstimateId: dividendsEstimate.DividendsEstimateId,
  192 + DividendsAccountStatus: dividendsEstimate.DividendsAccountStatus,
  193 + PaymentStatus: dividendsEstimate.PaymentStatus,
  194 + DividendsAmount: dividendsEstimate.DividendsAmount,
  195 + DividendsEstimateOrderNumber: dividendsEstimate.DividendsEstimateOrderNumber,
  196 + DividendsEstimateTime: dividendsEstimate.DividendsEstimateTime,
  197 + DividendsParticipateType: dividendsEstimate.DividendsParticipateType,
  198 + DividendsType: dividendsEstimate.DividendsType,
  199 + DividendsTypeName: dividendsEstimate.DividendsTypeName,
  200 + OrderOrReturnedOrderNum: dividendsEstimate.OrderOrReturnedOrderNum,
  201 + CooperationContractNumber: dividendsEstimate.CooperationContractNumber,
  202 + DividendsUser: dividendsEstimate.DividendsUser,
  203 + DividendsStage: dividendsEstimate.DividendsStage,
  204 + Org: dividendsEstimate.Org,
  205 + Company: dividendsEstimate.Company,
  206 + Operator: dividendsEstimate.Operator,
  207 + OperateTime: dividendsEstimate.OperateTime,
  208 + IsCanceled: dividendsEstimate.IsCanceled,
  209 + OrderGoodId: dividendsEstimate.OrderGoodId,
  210 + CreatedAt: dividendsEstimate.CreatedAt,
  211 + DeletedAt: dividendsEstimate.DeletedAt,
  212 + UpdatedAt: dividendsEstimate.UpdatedAt,
  213 + CooperationContractUndertakerId: dividendsEstimate.CooperationContractUndertakerId,
208 }) 214 })
209 } 215 }
210 if len(dividendsEstimateModels) > 0 { 216 if len(dividendsEstimateModels) > 0 {
@@ -229,28 +235,29 @@ func (repository *DividendsEstimateRepository) UpdateMany(dividendsEstimates []* @@ -229,28 +235,29 @@ func (repository *DividendsEstimateRepository) UpdateMany(dividendsEstimates []*
229 var dividendsEstimateModels []*models.DividendsEstimate 235 var dividendsEstimateModels []*models.DividendsEstimate
230 for _, dividendsEstimate := range dividendsEstimates { 236 for _, dividendsEstimate := range dividendsEstimates {
231 dividendsEstimateModels = append(dividendsEstimateModels, &models.DividendsEstimate{ 237 dividendsEstimateModels = append(dividendsEstimateModels, &models.DividendsEstimate{
232 - DividendsEstimateId: dividendsEstimate.DividendsEstimateId,  
233 - DividendsAccountStatus: dividendsEstimate.DividendsAccountStatus,  
234 - PaymentStatus: dividendsEstimate.PaymentStatus,  
235 - DividendsAmount: dividendsEstimate.DividendsAmount,  
236 - DividendsEstimateOrderNumber: dividendsEstimate.DividendsEstimateOrderNumber,  
237 - DividendsEstimateTime: dividendsEstimate.DividendsEstimateTime,  
238 - DividendsParticipateType: dividendsEstimate.DividendsParticipateType,  
239 - DividendsType: dividendsEstimate.DividendsType,  
240 - DividendsTypeName: dividendsEstimate.DividendsTypeName,  
241 - OrderOrReturnedOrderNum: dividendsEstimate.OrderOrReturnedOrderNum,  
242 - CooperationContractNumber: dividendsEstimate.CooperationContractNumber,  
243 - DividendsUser: dividendsEstimate.DividendsUser,  
244 - DividendsStage: dividendsEstimate.DividendsStage,  
245 - Org: dividendsEstimate.Org,  
246 - Company: dividendsEstimate.Company,  
247 - Operator: dividendsEstimate.Operator,  
248 - OperateTime: dividendsEstimate.OperateTime,  
249 - IsCanceled: dividendsEstimate.IsCanceled,  
250 - OrderGoodId: dividendsEstimate.OrderGoodId,  
251 - CreatedAt: dividendsEstimate.CreatedAt,  
252 - DeletedAt: dividendsEstimate.DeletedAt,  
253 - UpdatedAt: time.Now(), 238 + DividendsEstimateId: dividendsEstimate.DividendsEstimateId,
  239 + DividendsAccountStatus: dividendsEstimate.DividendsAccountStatus,
  240 + PaymentStatus: dividendsEstimate.PaymentStatus,
  241 + DividendsAmount: dividendsEstimate.DividendsAmount,
  242 + DividendsEstimateOrderNumber: dividendsEstimate.DividendsEstimateOrderNumber,
  243 + DividendsEstimateTime: dividendsEstimate.DividendsEstimateTime,
  244 + DividendsParticipateType: dividendsEstimate.DividendsParticipateType,
  245 + DividendsType: dividendsEstimate.DividendsType,
  246 + DividendsTypeName: dividendsEstimate.DividendsTypeName,
  247 + OrderOrReturnedOrderNum: dividendsEstimate.OrderOrReturnedOrderNum,
  248 + CooperationContractNumber: dividendsEstimate.CooperationContractNumber,
  249 + DividendsUser: dividendsEstimate.DividendsUser,
  250 + DividendsStage: dividendsEstimate.DividendsStage,
  251 + Org: dividendsEstimate.Org,
  252 + Company: dividendsEstimate.Company,
  253 + Operator: dividendsEstimate.Operator,
  254 + OperateTime: dividendsEstimate.OperateTime,
  255 + IsCanceled: dividendsEstimate.IsCanceled,
  256 + OrderGoodId: dividendsEstimate.OrderGoodId,
  257 + CreatedAt: dividendsEstimate.CreatedAt,
  258 + DeletedAt: dividendsEstimate.DeletedAt,
  259 + UpdatedAt: time.Now(),
  260 + CooperationContractUndertakerId: dividendsEstimate.CooperationContractUndertakerId,
254 }) 261 })
255 } 262 }
256 if _, err := tx.Model(&dividendsEstimateModels).WherePK().Update(); err != nil { 263 if _, err := tx.Model(&dividendsEstimateModels).WherePK().Update(); err != nil {
@@ -45,7 +45,7 @@ func (serviceGateway *httplibBaseServiceGateway) createRequest(url string, metho @@ -45,7 +45,7 @@ func (serviceGateway *httplibBaseServiceGateway) createRequest(url string, metho
45 case "head": 45 case "head":
46 request = httplib.Head(url) 46 request = httplib.Head(url)
47 break 47 break
48 - default: 48 + :
49 request = httplib.Get(url) 49 request = httplib.Get(url)
50 } 50 }
51 return request.SetTimeout(serviceGateway.connectTimeout, serviceGateway.readWriteTimeout) 51 return request.SetTimeout(serviceGateway.connectTimeout, serviceGateway.readWriteTimeout)