Merge branch 'release' into test

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

@@ -2075,7 +2075,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                 BigDecimal taxAndAmount = xmje.add(se);
                 BigDecimal taxAmountNew = taxAndAmount.divide(new BigDecimal("1").add(taxRate),0).multiply(taxRate).setScale(2,RoundingMode.HALF_UP);
                 BigDecimal xmjeNew = taxAndAmount.multiply(taxAmountNew);
-                orderItemInfo.setXmje(xmje.toString());
+                orderItemInfo.setXmje(xmje.add(se).subtract(taxAmountNew).toString());
                 orderItemInfo.setSe(taxAmountNew.toString());
                 if(StringUtils.isNotBlank(orderItemInfo.getXmsl())){
                     BigDecimal xmdj = xmjeNew.divide(xmsl, 8, RoundingMode.HALF_UP);