外协结算

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java

@@ -1858,15 +1858,14 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
                 match = PriceMatcher.isContainsPrice(sheet.getAuAgPrice(), price);
             }
             if (match) {
-                if (hasColorCount(statementVO)) {
+                if (isTsb(statementVO.getPsName())) {
                     colorPriceSheetVOS.add(sheet);
                 } else if (ruleTieredPricing(statementVO, sheet)) {
                     return setSettlementInfo(statementVO, sheet);
                 }
-
             }
         }
-        if (hasColorCount(statementVO)) {
+        if (isTsb(statementVO.getPsName())) {
             statementVO.setPriceSheetList(colorPriceSheetVOS);
             return ruleColor(statementVO, colorPriceSheetVOS);
         }
@@ -2052,6 +2051,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
         if (mesOemStatement.getPrice() != null) {
             price = mesOemStatement.getPrice();
         }
+        // 结算
         List<StatementVO> settlementList = settlement(statementVOS, price, false);
         for (StatementVO statementVO : settlementList) {
             OemStatementEntity entity = new OemStatementEntity();