合并分支 'dev' 到 'test'

Dev



查看合并请求 !36

@@ -654,7 +654,6 @@ func (cooperationProjectService *CooperationProjectService) UpdateCooperationPro
 	if k1 != 0 && k2 != 0 {
 	if k1 != 0 && k2 != 0 {
 		undertakerTypes = append(undertakerTypes, 4)
 		undertakerTypes = append(undertakerTypes, 4)
 	}
 	}
-
 	// 校验可以修改的承接人（申请人）类型
 	// 校验可以修改的承接人（申请人）类型
 	for _, t := range undertakerTypes {
 	for _, t := range undertakerTypes {
 		if !utils.IsContain(updateCooperationProjectCommand.CooperationProjectUndertakerTypes, t) {
 		if !utils.IsContain(updateCooperationProjectCommand.CooperationProjectUndertakerTypes, t) {
@@ -663,7 +662,7 @@ func (cooperationProjectService *CooperationProjectService) UpdateCooperationPro
 				return nil, application.ThrowError(application.BUSINESS_ERROR, "承接对象'员工'存在业务数据，不可取消勾选")
 				return nil, application.ThrowError(application.BUSINESS_ERROR, "承接对象'员工'存在业务数据，不可取消勾选")
 			case 2:
 			case 2:
 				return nil, application.ThrowError(application.BUSINESS_ERROR, "承接对象'共创用户'存在业务数据，不可取消勾选")
 				return nil, application.ThrowError(application.BUSINESS_ERROR, "承接对象'共创用户'存在业务数据，不可取消勾选")
-			case 4:
+			case 3:
 				return nil, application.ThrowError(application.BUSINESS_ERROR, "承接对象'公开'存在业务数据，不可取消勾选")
 				return nil, application.ThrowError(application.BUSINESS_ERROR, "承接对象'公开'存在业务数据，不可取消勾选")
 			}
 			}
 		}
 		}

@@ -1236,7 +1236,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDivide
 			UpdatedAt:                    time.Now(),
 			UpdatedAt:                    time.Now(),
 		})
 		})
 		// 计算分红退货单金额
 		// 计算分红退货单金额
-		dividendsReturnedOrderAmount, _ = decimal.NewFromFloat(dividendsReturnedOrderAmount).Add(decimal.NewFromFloat(orderGood.OrderGoodAmount)).Float64()
+		dividendsReturnedOrderAmount, _ = decimal.NewFromFloat(dividendsReturnedOrderAmount).Add(decimal.NewFromFloat(orderGoodAmount)).Float64()
 	}
 	}
 
 
 	if err := dividendsReturnedOrder.Update(tool_funs.SimpleStructToMap(updateDividendsReturnedOrderCommand)); err != nil {
 	if err := dividendsReturnedOrder.Update(tool_funs.SimpleStructToMap(updateDividendsReturnedOrderCommand)); err != nil {