From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划,是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/dto/OrderNotify.java |   60 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/dto/OrderNotify.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/dto/OrderNotify.java
index dff01c7..1d44981 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/dto/OrderNotify.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/dto/OrderNotify.java
@@ -48,34 +48,34 @@
     private String summary;
 
 
-    @Data
-    public class NotifyResource {
-
-        /**
-         * 鍔犲瘑绠楁硶绫诲瀷
-         * 浠呮敮鎸丄EAD_AES_256_GCM
-         */
-        private String algorithm;
-
-        /**
-         * 鏁版嵁瀵嗘枃
-         */
-        private String ciphertext;
-
-        /**
-         * 闄勫姞鏁版嵁
-         */
-        public String associated_data;
-
-        /**
-         * 鍘熷绫诲瀷
-         * 鍘熷鍥炶皟绫诲瀷涓猴細transaction
-         */
-        private String original_type;
-
-        /**
-         * 闅忔満涓�
-         */
-        private String nonce;
-    }
+    //@Data
+    //public class NotifyResource {
+    //
+    //    /**
+    //     * 鍔犲瘑绠楁硶绫诲瀷
+    //     * 浠呮敮鎸丄EAD_AES_256_GCM
+    //     */
+    //    private String algorithm;
+    //
+    //    /**
+    //     * 鏁版嵁瀵嗘枃
+    //     */
+    //    private String ciphertext;
+    //
+    //    /**
+    //     * 闄勫姞鏁版嵁
+    //     */
+    //    public String associated_data;
+    //
+    //    /**
+    //     * 鍘熷绫诲瀷
+    //     * 鍘熷鍥炶皟绫诲瀷涓猴細transaction
+    //     */
+    //    private String original_type;
+    //
+    //    /**
+    //     * 闅忔満涓�
+    //     */
+    //    private String nonce;
+    //}
 }
\ No newline at end of file

--
Gitblit v1.8.0