From c81811d187c80d02af7faf42520e1c730362fdbc Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Wed, 29 May 2024 19:12:42 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E5=A2=9E=E5=8A=A0=E6=88=91?=
 =?UTF-8?q?=E4=B9=90=E8=87=AA=E5=AE=9A=E4=B9=89=E6=95=B0=E6=8D=AE=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factorydata/olo/mapper/DeliveryNoteMapper.java    |  2 ++
 .../factorydata/olo/mapper/FactoryNodeOrderMapper.xml | 11 ++++++++---
 .../olo/service/impl/DeliveryNoteServiceImpl.java     |  2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mapper/DeliveryNoteMapper.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mapper/DeliveryNoteMapper.java
index 5940a281a..966cc4ecd 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mapper/DeliveryNoteMapper.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mapper/DeliveryNoteMapper.java
@@ -4,6 +4,7 @@ import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.logpm.factorydata.olo.entity.DeliveryNoteEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 发货单 mapper
@@ -16,4 +17,5 @@ public interface DeliveryNoteMapper extends BaseMapper<DeliveryNoteEntity> {
 
 	JSONObject customPushNodeData();
 
+	void updateSustomPushNodeDataStatus(@Param("status") String status, @Param("orderNo") String orderNo, @Param("deliveryNo") String deliveryNo);
 }
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mapper/FactoryNodeOrderMapper.xml b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mapper/FactoryNodeOrderMapper.xml
index 605ab4d16..703057927 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mapper/FactoryNodeOrderMapper.xml
+++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mapper/FactoryNodeOrderMapper.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.logpm.factorydata.olo.mapper.DeliveryNoteMapper">
-
     <select id="customPushNodeData" resultType="cn.hutool.json.JSONObject">
         select status,
                opTime,
@@ -14,7 +13,13 @@
                group_concat(sn) sns
           from olo_custom_push_data
          where sendStatus = 0
-         group by orderNo,deliveryNo
-         limit 1
+         group by orderNo, deliveryNo, status limit 1
     </select>
+    <update id="updateSustomPushNodeDataStatus">
+        update olo_custom_push_data
+           set sendStatus = 1
+         where status = #{status}
+           and orderNo = #{orderNo}
+           and deliveryNo = #{deliveryNo}
+    </update>
 </mapper>
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java
index 80657b4fc..eb1f98f72 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java
@@ -257,6 +257,8 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 				log.info("自定义推送节点数据：{}", js.toString());
 				String post = HttpUtil.post(oldProperties.getPushNodeUrl(), js.toString());
 				log.info("推送结果：{}", post);
+				// 修改推送状态
+				this.baseMapper.updateSustomPushNodeDataStatus(js.getStr("status"), js.getStr("orderNo"), js.getStr("deliveryNo"));
 			} catch (Exception e) {
 				e.printStackTrace();
 				log.error("推送节点数据错误：{}", e);