Commit 4ff5f1f6 by jianan

前端对接问题修复87

parent 470b2d7a
...@@ -119,6 +119,7 @@ public class CommissionAsyncService { ...@@ -119,6 +119,7 @@ public class CommissionAsyncService {
// 预计来佣设置为部分来佣 // 预计来佣设置为部分来佣
commissionExpectedService.lambdaUpdate() commissionExpectedService.lambdaUpdate()
.set(CommissionExpected::getStatus, CommissionExpectedStatusEnum.PARTIAL.getItemValue()) .set(CommissionExpected::getStatus, CommissionExpectedStatusEnum.PARTIAL.getItemValue())
.set(CommissionExpected::getPaidAmount, actualAmount)
.eq(CommissionExpected::getId, commissionExpected.getId()) .eq(CommissionExpected::getId, commissionExpected.getId())
.update(); .update();
// 来佣比对失败 // 来佣比对失败
...@@ -244,6 +245,8 @@ public class CommissionAsyncService { ...@@ -244,6 +245,8 @@ public class CommissionAsyncService {
// 对应预计来佣设置为部分来佣 // 对应预计来佣设置为部分来佣
commissionExpectedService.lambdaUpdate() commissionExpectedService.lambdaUpdate()
.set(CommissionExpected::getStatus, CommissionExpectedStatusEnum.PARTIAL.getItemValue()) .set(CommissionExpected::getStatus, CommissionExpectedStatusEnum.PARTIAL.getItemValue())
.set(CommissionExpected::getPaidAmount, paidAmount)
.set(CommissionExpected::getPaidRatio, paidRatio)
.eq(CommissionExpected::getId, commissionExpected.getId()) .eq(CommissionExpected::getId, commissionExpected.getId())
.update(); .update();
// 更新已比对来佣记录 // 更新已比对来佣记录
...@@ -321,6 +324,7 @@ public class CommissionAsyncService { ...@@ -321,6 +324,7 @@ public class CommissionAsyncService {
// 预计来佣设置为部分来佣 // 预计来佣设置为部分来佣
commissionExpectedService.lambdaUpdate() commissionExpectedService.lambdaUpdate()
.set(CommissionExpected::getStatus, CommissionExpectedStatusEnum.PARTIAL.getItemValue()) .set(CommissionExpected::getStatus, CommissionExpectedStatusEnum.PARTIAL.getItemValue())
.set(CommissionExpected::getPaidAmount, commission.getAmount())
.eq(CommissionExpected::getId, commissionExpected.getId()) .eq(CommissionExpected::getId, commissionExpected.getId())
.update(); .update();
// 保存比对记录 // 保存比对记录
...@@ -409,6 +413,8 @@ public class CommissionAsyncService { ...@@ -409,6 +413,8 @@ public class CommissionAsyncService {
// 预计来佣设置为部分来佣 // 预计来佣设置为部分来佣
commissionExpectedService.lambdaUpdate() commissionExpectedService.lambdaUpdate()
.set(CommissionExpected::getStatus, CommissionExpectedStatusEnum.PARTIAL.getItemValue()) .set(CommissionExpected::getStatus, CommissionExpectedStatusEnum.PARTIAL.getItemValue())
.set(CommissionExpected::getPaidAmount, paidAmount)
.set(CommissionExpected::getPaidRatio, paidRatio)
.eq(CommissionExpected::getId, commissionExpected.getId()) .eq(CommissionExpected::getId, commissionExpected.getId())
.update(); .update();
// 保存比对记录 // 保存比对记录
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment