feature：订单明细合并

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java

@@ -479,7 +479,7 @@ public class OrderInfoController {
         JSONObject jsonObject = JSONObject.parseObject(param);
         String entId = jsonObject.getString("entId");
         String orderInfoId = jsonObject.getString("orderInfoId");
-        JSONArray jsonArray = jsonObject.getJSONArray(" itemList");
+        JSONArray jsonArray = jsonObject.getJSONArray("itemList");
         if(jsonArray == null || jsonArray.isEmpty()){
             return R.error("请求参数有误,待合并明细行不允许为空");
         }

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

@@ -1867,9 +1867,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
             BigDecimal xmje = new BigDecimal("0");
             BigDecimal se = new BigDecimal("0");
             for (OrderItemInfo orderItemInfo : value) {
-                xmsl.add(new BigDecimal(orderItemInfo.getXmsl()));
-                xmje.add(new BigDecimal(orderItemInfo.getXmje()));
-                se.add(new BigDecimal(orderItemInfo.getSe()));
+                xmsl = xmsl.add(new BigDecimal(orderItemInfo.getXmsl()));
+                xmje = xmje.add(new BigDecimal(orderItemInfo.getXmje()));
+                se = se.add(new BigDecimal(orderItemInfo.getSe()));
             }
             OrderItemInfo orderItemInfo = value.get(0);
             orderItemInfo.setXmsl(xmsl.toString());
@@ -1886,7 +1886,8 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                 taxAmout = xmje.multiply(taxRate).setScale(2,RoundingMode.HALF_UP);
             }
             orderItemInfo.setCreateTime(new Date());
-            if(se.multiply(taxAmout).abs().longValue() <= 0.06){
+            orderItemInfo.setSe(se.toString());
+            if(se.subtract(taxAmout).abs().longValue() <= 0.06){
                 orderItemInfoList.add(orderItemInfo);
                 deleteItem.addAll(value.stream().map(t->t.getId()).collect(Collectors.toList()));
             }else{
@@ -1905,9 +1906,17 @@ public class OrderInfoServiceImpl implements OrderInfoService {
 //        orderProcessInfo.setHjbhsje();
 //        orderProcessInfo.setKpse();
 //        orderProcessService.updateOrderProcessInfoByProcessId(orderProcessInfo,null);
+        if(!orderItemInfoList.isEmpty()){
             orderItemInfoMapper.deleteItemByItemId(deleteItem);
             orderItemInfoMapper.insertOrderItemByList(orderItemInfoList);
+        }
         //更新清单标志
+        if(orderItemInfos.size() > 8 &&orderItemInfos.size() - deleteItem.size() < 8 ){
+            OrderInfo orderInfo = new OrderInfo();
+            orderInfo.setId(orderInfoId);
+            orderInfo.setQdBz("0");
+            orderMapper.updateOrderInfoByOrderId(orderInfo,null);
+        }
         return R.ok();
     }