|
|
@ -33,6 +33,7 @@ import com.dxhy.order.model.*; |
|
|
|
import com.dxhy.order.utils.CommonUtils; |
|
|
|
import com.dxhy.order.utils.CommonUtils; |
|
|
|
import com.dxhy.order.utils.JsonUtils; |
|
|
|
import com.dxhy.order.utils.JsonUtils; |
|
|
|
import com.dxhy.order.utils.NsrsbhUtils; |
|
|
|
import com.dxhy.order.utils.NsrsbhUtils; |
|
|
|
|
|
|
|
import com.google.common.collect.Lists; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
@ -293,7 +294,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder |
|
|
|
|
|
|
|
|
|
|
|
// 补全明细信息
|
|
|
|
// 补全明细信息
|
|
|
|
List<OrderItemInfo> orderItemList = commonOrderInfo.getOrderItemInfo(); |
|
|
|
List<OrderItemInfo> orderItemList = commonOrderInfo.getOrderItemInfo(); |
|
|
|
boolean kcp = orderItemList.stream().allMatch(orderItemInfo -> baseServiceConfig.getKcpspbm().contains(orderItemInfo.getSpbm())); |
|
|
|
boolean kcp = orderItemList.stream().allMatch(orderItemInfo -> StringUtils.isNotBlank(orderItemInfo.getSpbm()) && baseServiceConfig.getKcpspbm().contains(orderItemInfo.getSpbm())); |
|
|
|
if(kcp){ |
|
|
|
if(kcp){ |
|
|
|
orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_7.getKey()); |
|
|
|
orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_7.getKey()); |
|
|
|
if(orderItemList.size() > ConfigureConstant.INT_8){ |
|
|
|
if(orderItemList.size() > ConfigureConstant.INT_8){ |
|
|
@ -314,6 +315,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 生成待开具订单 |
|
|
|
* 生成待开具订单 |
|
|
|
*/ |
|
|
|
*/ |
|
|
@ -878,6 +880,29 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public static void main(String[] args) { |
|
|
|
public static void main(String[] args) { |
|
|
|
|
|
|
|
List<String> list = Lists.newArrayList(); |
|
|
|
|
|
|
|
list.add("1"); |
|
|
|
|
|
|
|
list.add("2"); |
|
|
|
|
|
|
|
list.add("3"); |
|
|
|
|
|
|
|
list.add("4"); |
|
|
|
|
|
|
|
String collect = list.stream().collect(Collectors.joining(",")); |
|
|
|
|
|
|
|
// boolean kcp = orderItemList.stream().allMatch(orderItemInfo -> baseServiceConfig.getKcpspbm().contains(orderItemInfo.getSpbm()));
|
|
|
|
|
|
|
|
// if(kcp){
|
|
|
|
|
|
|
|
// orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_7.getKey());
|
|
|
|
|
|
|
|
// if(orderItemList.size() > ConfigureConstant.INT_8){
|
|
|
|
|
|
|
|
// orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_8.getKey());
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String str1 = ""; |
|
|
|
|
|
|
|
boolean b = list.stream().allMatch(l -> StringUtils.isNotBlank(str1) && collect.contains(str1)); |
|
|
|
|
|
|
|
if(b){ |
|
|
|
|
|
|
|
System.out.println("98458845"); |
|
|
|
|
|
|
|
}else { |
|
|
|
|
|
|
|
System.out.println("134567890"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String str = "差额征税:5000.00。aaaaa"; |
|
|
|
String str = "差额征税:5000.00。aaaaa"; |
|
|
|
int indexOf = str.indexOf(ConfigureConstant.STRING_CEZS); |
|
|
|
int indexOf = str.indexOf(ConfigureConstant.STRING_CEZS); |
|
|
|
int indexOf2 = str.indexOf("。"); |
|
|
|
int indexOf2 = str.indexOf("。"); |
|
|
|