From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/java/com/matrix/system/hive/plugin/util/TimeUtils.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/plugin/util/TimeUtils.java b/zq-erp/src/main/java/com/matrix/system/hive/plugin/util/TimeUtils.java
index ec41ab3..2fb762f 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/plugin/util/TimeUtils.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/plugin/util/TimeUtils.java
@@ -1,5 +1,6 @@
package com.matrix.system.hive.plugin.util;
+import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.StringUtils;
import java.text.SimpleDateFormat;
@@ -337,8 +338,8 @@
Calendar c = Calendar.getInstance();
try {
int dataInt = StringUtils.stringToInt(data);
- int month = DateUtils.getMonth(createTime);
- int year = DateUtils.getYear(createTime);
+ int month = DateUtil.getMonth(createTime);
+ int year = DateUtil.getYear(createTime);
if (dataInt > 12 - month && dataInt < 12) {
month += dataInt;
year += 1;
@@ -437,7 +438,7 @@
String checkrule = "1";
Date resultDate = TimeUtils.getEndYearTime(data, checkrule);
- String time = DateUtils.dateToString(resultDate, DateUtils.DATE_FORMAT_SS);
+ String time = DateUtil.dateToString(resultDate, DateUtil.DATE_FORMAT_SS);
System.out.println(time);
}
}
\ No newline at end of file
--
Gitblit v1.9.1