diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml deleted file mode 100644 index 8cb5299..0000000 --- a/.idea/sqldialects.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/main/java/cn/van/business/repository/JDOrderRepository.java b/src/main/java/cn/van/business/repository/JDOrderRepository.java index 303779f..27802c8 100644 --- a/src/main/java/cn/van/business/repository/JDOrderRepository.java +++ b/src/main/java/cn/van/business/repository/JDOrderRepository.java @@ -34,4 +34,6 @@ public interface JDOrderRepository extends JpaRepository { * @return 订单列表 */ List findByDistributionMark(String distributionMark); + + void updateAllByOrderId(JDOrder jdOrder); } diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index 5f421fc..a7d20f7 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -1895,7 +1895,14 @@ public class JDUtil { public void LD(String input, String fromWxid) { JDOrder jdOrder = parseOrderFromText(input); - jdOrderRepository.save(jdOrder); + JDOrder byOrderId = jdOrderRepository.findByOrderId(jdOrder.getOrderId()); + if (byOrderId != null){ + logger.info("订单已存在:{}", byOrderId); + jdOrderRepository.updateAllByOrderId(jdOrder); + }else { + logger.info("订单不存在,新增:{}", jdOrder); + jdOrderRepository.save(jdOrder); + } StringBuilder sb = new StringBuilder(); //单号 下单日期 型号 内部订单号 地址 物流 外派给谁 后返金额 谁的单 下单价格 // 从jdOrder中获取转化 diff --git a/src/main/java/cn/van/business/util/WXUtil.java b/src/main/java/cn/van/business/util/WXUtil.java index 840bc17..da68875 100644 --- a/src/main/java/cn/van/business/util/WXUtil.java +++ b/src/main/java/cn/van/business/util/WXUtil.java @@ -51,7 +51,7 @@ public class WXUtil { public static String chatRoom_BY = "50400969285@chatroom"; //群(50006079425@chatroom) - public static String chatRoom_JD_Order = "50400969285@chatroom"; + public static String chatRoom_JD_Order = "49533691813@chatroom"; /** * url http://127.0.0.1:7777/DaenWxHook/httpapi/ * 获取微信列表 (X0000)