exit:黑名单记录买票数据

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java

@@ -411,7 +411,7 @@ public class OrderUtils {
                     agentVo.setIdentity(identity);
                     agentVo.setIsBlack(isBlack);
                     agentVo.setAgentId(agentId);
-                    if (isBlack == 1) {
+                    /*if (isBlack == 1) {
                         agentVo.setAgentMasterId("0");
                         agentVo.setCarry(BigDecimal.ZERO);
                         agentVo.setExCarry(BigDecimal.ZERO);
@@ -426,6 +426,15 @@ public class OrderUtils {
                             agentVo.setCarry(ordCarry);
                             agentVo.setExCarry(totalCarry.subtract(ordCarry));
                         }
+                    }*/
+                    if (agentId.equals(masterId)) {
+                        agentVo.setAgentMasterId("0");
+                        agentVo.setCarry(totalCarry);
+                        agentVo.setExCarry(BigDecimal.ZERO);
+                    } else {
+                        agentVo.setAgentMasterId(masterId);
+                        agentVo.setCarry(ordCarry);
+                        agentVo.setExCarry(totalCarry.subtract(ordCarry));
                     }
                     return agentVo;
                 } else {