From d736d220008f3ddaed44ac6bfa8a19eb8ca61e96 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 12 十月 2024 14:09:39 +0800
Subject: [PATCH] 1、江海协议功能C2增加订单号数据项; 2、下行命令构造时标TP当月份大于等于10时有错,进行修改。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
index 3938bb6..283c37e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
@@ -539,10 +539,10 @@
      * @return
      */
     public Map getReceipts(QoReceipt queryVo) {
-        if (queryVo.getTimeStart() != null || queryVo.getTimeStart() != ""){
+        if (queryVo.getTimeStart() != null && queryVo.getTimeStart() != ""){
             queryVo.setTimeStart(queryVo.getTimeStart() + " 00:00:00");
         }
-        if (queryVo.getTimeStop() != null || queryVo.getTimeStop() != ""){
+        if (queryVo.getTimeStop() != null && queryVo.getTimeStop() != ""){
             queryVo.setTimeStop(queryVo.getTimeStop() + " 23:59:59");
         }
 

--
Gitblit v1.8.0