feature：明细合并

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

@@ -2120,15 +2120,13 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         if("1".equals(orderInfo.getQdBz())&&orderItemInfos.size() - deleteItem.size() < 8 ){
             orderInfoNew.setQdBz("0");
         }
-        if(diffJe.compareTo(BigDecimal.ZERO) != 0){
+        String bhsje = new BigDecimal(orderInfo.getKphjje()).subtract(se).toString();
-            String bhsje = new BigDecimal(orderInfo.getKphjje()).subtract(se).toString();
+        orderInfoNew.setHjbhsje(bhsje);
-            orderInfoNew.setHjbhsje(bhsje);
+        orderInfoNew.setHjse(se.toString());
-            orderInfoNew.setHjse(se.toString());
+        orderProcessInfoNew.setHjbhsje(bhsje);
-            orderProcessInfoNew.setHjbhsje(bhsje);
+        orderProcessInfoNew.setKpse(se.toString());
-            orderProcessInfoNew.setKpse(se.toString());
+        orderMapper.updateOrderInfoByOrderId(orderInfoNew,Arrays.asList(orderInfo.getNsrsbh()));
-            orderMapper.updateOrderInfoByOrderId(orderInfoNew,Arrays.asList(orderInfo.getNsrsbh()));
+        orderProcessInfoMapper.updateOrderProcessInfoByProcessId(orderProcessInfoNew,Arrays.asList(orderInfo.getNsrsbh()));
-            orderProcessInfoMapper.updateOrderProcessInfoByProcessId(orderProcessInfoNew,Arrays.asList(orderInfo.getNsrsbh()));
-        }
         return R.ok();
     }