|
|
|
@ -1841,7 +1841,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { |
|
|
|
|
Map map = new HashMap(2); |
|
|
|
|
map.put("cpy","Y"); |
|
|
|
|
Integer integer = taxClassCodeMapper.countTaxClassCodeBySpbm(collect1, map); |
|
|
|
|
if(orderItemInfoList.size()==integer.intValue()){ |
|
|
|
|
if(orderItemInfos.size()==integer.intValue()){ |
|
|
|
|
//更新order_info 清单标志为4
|
|
|
|
|
OrderInfo orderInfo = new OrderInfo(); |
|
|
|
|
orderInfo.setId(orderInfoId); |
|
|
|
@ -1892,7 +1892,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { |
|
|
|
|
//重算税额
|
|
|
|
|
String hsbz = orderItemInfo.getHsbz(); |
|
|
|
|
BigDecimal taxRate = new BigDecimal(orderItemInfo.getSl()); |
|
|
|
|
BigDecimal taxAmout = new BigDecimal(orderItemInfo.getSl()); |
|
|
|
|
BigDecimal taxAmout = new BigDecimal(orderItemInfo.getXmje()); |
|
|
|
|
if (OrderInfoEnum.HSBZ_1.getKey().equals(hsbz)) { |
|
|
|
|
taxAmout = xmje.divide(new BigDecimal("1").add(taxRate),0).multiply(taxRate).setScale(2,RoundingMode.HALF_UP); |
|
|
|
|
} else if (OrderInfoEnum.HSBZ_0.getKey().equals(hsbz)) { |
|
|
|
|