Merge branch 'dev-new' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into dev-new

order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java

@@ -160,6 +160,7 @@ public enum OrderInfoContentEnum {
 
     ORDER_MERGE_FPLX_DIFFERENT_ERROR("9608", "所选订单发票类型不一致，不允许合并"),
     ORDER_MERGE_SKSB_DIFFERENT_ERROR("9608", "所选订单税控设备类型不一致，不允许合并"),
+    ORDER_MERGE_DDH_DIFFERENT_ERROR("9608", "所选结算单号不一致，不允许合并"),
 
     ORDER_MERGE_GFXX_DIFFERENT_ERROR("9609", "所选订单购方信息不一致，不允许合并"),
 

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

@@ -724,6 +724,7 @@ public class OrderMergeServiceImpl implements OrderMergeService {
         String ddly = orderInfo.get(0).getProcessInfo().getDdly();
         String xhfnsrsbh = orderInfo.get(0).getOrderInfo().getXhfNsrsbh();
         String sksbCode = orderInfo.get(0).getOrderInfo().getSksbCode();
+        String ddh = orderInfo.get(0).getOrderInfo().getDdh();
         int itemCount = 0;
         int dpmxSl = 0;
         boolean isCpySpbm = OrderInfoEnum.QDBZ_CODE_4.getKey().equals(orderInfo.get(0).getOrderInfo().getQdBz());
@@ -751,7 +752,10 @@ public class OrderMergeServiceImpl implements OrderMergeService {
                 log.info("{} 所选订单税控设备类型不一致，不允许合并", LOGGER_MSG);
                 return R.error(OrderInfoContentEnum.ORDER_MERGE_SKSB_DIFFERENT_ERROR);
             }
-
+            if (!ddh.equals(commonOrderInfo.getOrderInfo().getDdh())) {
+                log.info("{} 所选结算单号不一致，不允许合并", LOGGER_MSG);
+                return R.error(OrderInfoContentEnum.ORDER_MERGE_DDH_DIFFERENT_ERROR);
+            }
             if (!fplx.equals(commonOrderInfo.getOrderInfo().getFpzlDm())) {
                 log.info("{} 所选订单发票类型不一致，不允许合并", LOGGER_MSG);
                 return R.error(OrderInfoContentEnum.ORDER_MERGE_FPLX_DIFFERENT_ERROR);