fix:1.时空订单保存后修改订单状态，2.订单处理删除对应删除中间表

order-management-order/src/main/java/com/dxhy/order/consumer/dao/SkOrderInfoMapper.java

@@ -2,6 +2,7 @@ package com.dxhy.order.consumer.dao;
 
 import com.dxhy.order.consumer.modules.bespoke.model.req.ReqParam;
 import com.dxhy.order.consumer.modules.bespoke.model.sk.SkOrderInfo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -18,4 +19,8 @@ public interface SkOrderInfoMapper {
 
     //删除订单
     int delOrder(ReqParam reqParam);
+
+    SkOrderInfo queryByDdh(ReqParam reqParam);
+
+    int updateStatus( @Param("xsddm") String xsddm, @Param("status") String status);
 }

order-management-order/src/main/java/com/dxhy/order/consumer/dao/YyOrderInfoMapper.java

@@ -23,4 +23,6 @@ public interface YyOrderInfoMapper {
     int updateStatus(@Param("cdlcode") String cdlcode, @Param("status") String status);
 
     YyOrderInfo getSaveOrder(String originDdh);
+
+    YyOrderInfo queryByDdh(ReqParam reqParam);
 }

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

@@ -175,6 +175,8 @@ public class SkOrderServiceImpl implements OrderService {
                     log.debug("V3生成预制返回信息：{}", JSON.toJSONString(ddpcxxRspBO));
                     String format = String.format(message, skOrderInfo.getXsddm(), ddpcxxRspBO.getZTXX());
                     if (ddpcxxRspBO.getZTDM().equals(OrderValidateEnum.INVOICE_ERROR_CODE_010000_V3.getKey())) {
+                        //添加状态修改
+                        skOrderInfoMapper.updateStatus(skOrderInfo.getXsddm(), ConfigureConstant.STRING_1);
                         backMessage.add(com.dxhy.base.common.constant.ConfigureConstant.INT_0, format);
                     } else {
                         backMessage.add(format);
@@ -259,9 +261,9 @@ public class SkOrderServiceImpl implements OrderService {
 
     @Override
     public int delOrderByDdh(ReqParam reqParam) {
-        List<SkOrderInfo> skOrderInfoList = skOrderInfoMapper.queryList(reqParam);
+        SkOrderInfo skOrderInfo = skOrderInfoMapper.queryByDdh(reqParam);
-        if (CollectionUtils.isNotEmpty(skOrderInfoList)){
+        if (skOrderInfo != null){
-            reqParam.setIds(Arrays.asList(skOrderInfoList.get(0).getId()));
+            reqParam.setIds(Arrays.asList(skOrderInfo.getId()));
             int count = skOrderInfoMapper.delOrder(reqParam);
             skOrderItemInfoMapper.delOrder(reqParam.getIds());
             return count;

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

@@ -260,9 +260,9 @@ public class YyOrderServiceImpl implements OrderService {
 
     @Override
     public int delOrderByDdh(ReqParam reqParam) {
-        List<YyOrderInfo> yyOrderInfoList = yyOrderInfoMapper.queryList(reqParam);
+        YyOrderInfo yyOrderInfo = yyOrderInfoMapper.queryByDdh(reqParam);
-        if (CollectionUtils.isNotEmpty(yyOrderInfoList)){
+        if (yyOrderInfo != null){
-            reqParam.setIds(Arrays.asList(yyOrderInfoList.get(0).getId()));
+            reqParam.setIds(Arrays.asList(yyOrderInfo.getId()));
             int count = yyOrderInfoMapper.delOrder(reqParam);
             yyOrderItemInfoMapper.delOrder(reqParam.getIds());
             return count;

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

@@ -178,10 +178,28 @@
         delete from sk_order_info
         where nsrsbh = #{nsrsbh}
         and ent_id = #{entId}
-        and status = '0'
         and id in
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
+
+    <select id="queryByDdh" resultMap="SkOrderInfoResult" parameterType="com.dxhy.order.consumer.modules.bespoke.model.req.ReqParam">
+        <include refid="selectSkOrderInfoVo"/>
+        <where>
+            <if test="nsrsbh != null and nsrsbh != ''">
+                and nsrsbh = #{nsrsbh}
+            </if>
+            <if test="entId != null and entId != ''">
+                and ent_id = #{entId}
+            </if>
+            <if test="ddh != null and ddh != ''">
+                and xsddm = #{ddh}
+            </if>
+        </where>
+    </select>
+
+    <update id="updateStatus" parameterType="java.lang.String">
+        update sk_order_info set status = #{status} where xsddm = #{xsddm}
+    </update>
 </mapper>

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

@@ -211,7 +211,6 @@
         delete from yy_order_info
         where nsrsbh = #{nsrsbh}
         and ent_id = #{entId}
-        and status = '0'
         and id in
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}
@@ -229,4 +228,11 @@
         and cdlcode = #{cdlcode}
         and status = '1'
     </select>
+
+    <select id="queryByDdh" resultMap="YyOrderInfoResult" parameterType="com.dxhy.order.consumer.modules.bespoke.model.req.ReqParam">
+        <include refid="selectYyOrderInfoVo"/>
+        where nsrsbh = #{nsrsbh}
+        and ent_id = #{entId}
+        and cdlcode = #{ddh}
+    </select>
 </mapper>