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

转到一个项目

作者 yangfu
提交 1e3f2fc540aed8b12041843dad175e9a2f5d63d4 2 个父辈 e00be171 66623895

Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creat… 

…ion-cooperation into dev
内嵌 并排对比
正在显示 1 个修改的文件 包含 3 行增加 和 0 行删除
@@ -706,6 +706,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent @@ -706,6 +706,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
706 UpdatedAt: time.Time{}, 706 UpdatedAt: time.Time{},
707 OrderGoodId: orderGood.OrderGoodId, 707 OrderGoodId: orderGood.OrderGoodId,
708 OrderGoodAmount: orderGood.OrderGoodAmount, 708 OrderGoodAmount: orderGood.OrderGoodAmount,
  709 + PaymentStatus: int32(1),
709 } 710 }
710 711
711 dividendsEstimates = append(dividendsEstimates, dividendsEstimate) 712 dividendsEstimates = append(dividendsEstimates, dividendsEstimate)
@@ -759,6 +760,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent @@ -759,6 +760,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
759 UpdatedAt: time.Time{}, 760 UpdatedAt: time.Time{},
760 OrderGoodId: orderGood.OrderGoodId, 761 OrderGoodId: orderGood.OrderGoodId,
761 OrderGoodAmount: orderGood.OrderGoodAmount, 762 OrderGoodAmount: orderGood.OrderGoodAmount,
  763 + PaymentStatus: int32(1),
762 } 764 }
763 765
764 dividendsEstimates = append(dividendsEstimates, dividendsEstimate) 766 dividendsEstimates = append(dividendsEstimates, dividendsEstimate)
@@ -1095,6 +1097,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmMoneyIncentives @@ -1095,6 +1097,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmMoneyIncentives
1095 CreatedAt: time.Now(), 1097 CreatedAt: time.Now(),
1096 DeletedAt: time.Time{}, 1098 DeletedAt: time.Time{},
1097 UpdatedAt: time.Time{}, 1099 UpdatedAt: time.Time{},
  1100 + PaymentStatus: int32(1),
1098 } 1101 }
1099 1102
1100 dividendsEstimates = append(dividendsEstimates, dividendsEstimate) 1103 dividendsEstimates = append(dividendsEstimates, dividendsEstimate)