合并拆分成品油分支

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java

@@ -59,7 +59,6 @@ import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -174,7 +173,7 @@ public class InvoiceServiceImpl implements InvoiceService {
 //                return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方信息为空,请补全!");
 //            }
             String kcp = baseServiceConfig.getKcp();
-            boolean kcpMark = kcp.contains(commonOrderInfo.getOrderItemInfo().get(0).getSpbm());
+            boolean kcpMark;
             List<OrderItemInfo> cpyOrderItems = new ArrayList<OrderItemInfo>();
             List<OrderItemInfo> nocpyOrderItems = new ArrayList<OrderItemInfo>();
             for(OrderItemInfo orderItemInfo: commonOrderInfo.getOrderItemInfo()){