From 937f98d35b7bf6f809c229a9546272ef0fb1a1b4 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 12 Jun 2021 17:44:58 +0800
Subject: [PATCH] 新增赠送项目是否计算消耗控制

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
index 818338b..00c4211 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
@@ -98,20 +98,20 @@
                     break;
                 case "1":
                     queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
-                    queryUse.setIsOver(Dictionary.FLAG_NO_N);
+//                    queryUse.setIsOver(Dictionary.FLAG_NO_N);
                     break;
                 case "2":
                     queryUse.setTargetFailTime(DateUtil.getDateAfterMonth(new Date(), 1));
                     queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
-                    queryUse.setIsOver(Dictionary.FLAG_NO_N);
+//                    queryUse.setIsOver(Dictionary.FLAG_NO_N);
                     break;
                 case "3":
                     queryUse.setStatus(Dictionary.TAOCAN_STATUS_WX);
-                    queryUse.setIsOver(Dictionary.FLAG_YES_Y);
+//                    queryUse.setIsOver(Dictionary.FLAG_YES_Y);
                     break;
                 default:
                     queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
-                    queryUse.setIsOver(Dictionary.FLAG_NO_N);
+//                    queryUse.setIsOver(Dictionary.FLAG_NO_N);
                     break;
             }
         } else {

--
Gitblit v1.9.1