fix:修改排序字段

order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderHandleService.java

@@ -66,4 +66,6 @@ public interface OrderHandleService {
     R backMsg(String msg);
 
     boolean test();
+
+    int delOrderByDdh(ReqParam reqParam);
 }

order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderService.java

@@ -25,4 +25,5 @@ public interface OrderService {
     //订单回传
     R backMsg(OrderInvoiceInfo orderInvoiceInfo,List<OrderOriginExtendInfo> orderOriginExtendInfos, FileModel fileModel,String ddh);
 
+    int delOrderByDdh(ReqParam reqParam);
 }

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

@@ -432,6 +432,12 @@ public class OrderHandleServiceImpl implements OrderHandleService {
         return flag;
     }
 
+    @Override
+    public int delOrderByDdh(ReqParam reqParam) {
+        OrderService orderService = SpringUtil.getBean(serviceConfig.getService(reqParam.getNsrsbh()), OrderService.class);
+        return orderService.delOrderByDdh(reqParam);
+    }
+
     private void updatePushErrorMsgToDb(String fpqqlsh, String errorMessage, List<String> shList) {
         if (StringUtils.isNotBlank(fpqqlsh) && CollUtil.isNotEmpty(shList)) {
             OrderInvoiceInfo orderQuery = new OrderInvoiceInfo();

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

@@ -257,6 +257,18 @@ public class SkOrderServiceImpl implements OrderService {
         return R.ok();
     }
 
+    @Override
+    public int delOrderByDdh(ReqParam reqParam) {
+        List<SkOrderInfo> skOrderInfoList = skOrderInfoMapper.queryList(reqParam);
+        if (CollectionUtils.isNotEmpty(skOrderInfoList)){
+            reqParam.setIds(Arrays.asList(skOrderInfoList.get(0).getId()));
+            int count = skOrderInfoMapper.delOrder(reqParam);
+            skOrderItemInfoMapper.delOrder(reqParam.getIds());
+            return count;
+        }
+        return ConfigureConstant.INT_0;
+    }
+
     @Transactional
     public int saveOrder(SkOrderInfo skOrderInfo, List<SkOrderItemInfo> skOrderItemInfoList, ReqParam reqParam) {
 

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

@@ -258,6 +258,18 @@ public class YyOrderServiceImpl implements OrderService {
         return R.error("回传失败");
     }
 
+    @Override
+    public int delOrderByDdh(ReqParam reqParam) {
+        List<YyOrderInfo> yyOrderInfoList = yyOrderInfoMapper.queryList(reqParam);
+        if (CollectionUtils.isNotEmpty(yyOrderInfoList)){
+            reqParam.setIds(Arrays.asList(yyOrderInfoList.get(0).getId()));
+            int count = yyOrderInfoMapper.delOrder(reqParam);
+            yyOrderItemInfoMapper.delOrder(reqParam.getIds());
+            return count;
+        }
+        return ConfigureConstant.INT_0;
+    }
+
     public int accressReback(List<NewTable> newTableList, String nsrsbh, String fphm) {
 
         int count = ConfigureConstant.INT_0;

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

@@ -18,6 +18,8 @@ import com.dxhy.order.baseservice.constant.OrderValidateEnum;
 import com.dxhy.order.baseservice.model.OrderInvoiceInfo;
 import com.dxhy.order.baseservice.utils.OrderCommonUtils;
 import com.dxhy.order.consumer.model.page.PageRequestVO;
+import com.dxhy.order.consumer.modules.bespoke.model.req.ReqParam;
+import com.dxhy.order.consumer.modules.bespoke.service.OrderHandleService;
 import com.dxhy.order.consumer.modules.manager.service.InvoiceService;
 import com.dxhy.order.consumer.modules.order.model.PageInvoiceReq;
 import com.dxhy.order.consumer.modules.order.model.PageOrderReq;
@@ -74,6 +76,9 @@ public class OrderInvoiceController {
     @Resource
     private SpecialInvoiceReversalService specialInvoiceReversalService;
 
+    @Resource
+    private OrderHandleService orderHandleService;
+
 
     /**
      * 异常订单直接开票接口
@@ -378,6 +383,12 @@ public class OrderInvoiceController {
                 if (success < 0) {
                     errorMsgList.append(preStr).append("数据删除失败").append("\r\n");
                     continue;
+                }else {
+                    ReqParam reqParam = new ReqParam();
+                    reqParam.setNsrsbh(nsrsbh);
+                    reqParam.setEntId(orderProcessInfo.getEntId());
+                    reqParam.setDdh(orderProcessInfo.getDdh());
+                    orderHandleService.delOrderByDdh(reqParam);
                 }
                 //如果是红票数据,并且是专票,需要更新红字信息表数据
                 // 红字专票 作废后修改申请单的状态为未开票

order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml

@@ -202,7 +202,7 @@
                 order by cpznum desc
             </when>
             <otherwise>
-                order by cpznum, cdldate
+                order by cpznum, cdlcode
             </otherwise>
         </choose>
     </select>