部分退款时分销重置问题

src/main/java/com/szwl/controller/TOrderController.java

@@ -672,7 +672,7 @@ public class TOrderController {
                 selfHuifu = huifuMchService.getOne(queryWrapper2);
 
                 LambdaQueryWrapper<THuifuMch> queryWrapper3 = new LambdaQueryWrapper<>();
-                queryWrapper3.eq(THuifuMch::getAdminId,proportion.getAdminId());
+                queryWrapper3.eq(THuifuMch::getAdminId,proportion.getAgencyId());
                 agencyHuifu = huifuMchService.getOne(queryWrapper3);
                 // 公司平台分销
                 adminJson = new JSONObject();
@@ -712,11 +712,11 @@ public class TOrderController {
                 selfHuifu = huifuMchService.getOne(queryWrapper4);
 
                 LambdaQueryWrapper<THuifuMch> queryWrapper5 = new LambdaQueryWrapper<>();
-                queryWrapper5.eq(THuifuMch::getAdminId,proportion.getAdminId());
+                queryWrapper5.eq(THuifuMch::getAdminId,proportion.getAgencyId());
                 agencyHuifu = huifuMchService.getOne(queryWrapper5);
 
                 LambdaQueryWrapper<THuifuMch> queryWrapper6 = new LambdaQueryWrapper<>();
-                queryWrapper6.eq(THuifuMch::getAdminId,proportion.getAdminId());
+                queryWrapper6.eq(THuifuMch::getAdminId,proportion.getMerchantId());
                 merchantHuifu = huifuMchService.getOne(queryWrapper6);
                 // 公司平台分销
                 adminJson = new JSONObject();
@@ -833,7 +833,7 @@ public class TOrderController {
                 selfMch = joinpayMchService.getOne(queryWrapper2);
 
                 LambdaQueryWrapper<TJoinpayMch> queryWrapper3 = new LambdaQueryWrapper<>();
-                queryWrapper3.eq(TJoinpayMch::getAdminId,proportion.getAdminId());
+                queryWrapper3.eq(TJoinpayMch::getAdminId,proportion.getAgencyId());
                 agencyMch = joinpayMchService.getOne(queryWrapper3);
                 if(!(agencyProportion.compareTo(refuseAmount) == 0||agencyProportion==null)){
                     // 一级分销获得利润
@@ -868,11 +868,11 @@ public class TOrderController {
                 selfMch = joinpayMchService.getOne(queryWrapper4);
 
                 LambdaQueryWrapper<TJoinpayMch> queryWrapper5 = new LambdaQueryWrapper<>();
-                queryWrapper5.eq(TJoinpayMch::getAdminId,proportion.getAdminId());
+                queryWrapper5.eq(TJoinpayMch::getAdminId,proportion.getAgencyId());
                 agencyMch = joinpayMchService.getOne(queryWrapper5);
 
                 LambdaQueryWrapper<TJoinpayMch> queryWrapper6 = new LambdaQueryWrapper<>();
-                queryWrapper6.eq(TJoinpayMch::getAdminId,proportion.getAdminId());
+                queryWrapper6.eq(TJoinpayMch::getAdminId,proportion.getMerchantId());
                 merchantMch = joinpayMchService.getOne(queryWrapper6);
                 if(!(agencyProportion.compareTo(refuseAmount) == 0||agencyProportion==null)){
                     // 代理分销获得利润