From f76c9c5beb39916771402de95f05be18f39a9db6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 17 Dec 2020 14:34:33 +0800
Subject: [PATCH] finish vip_detail vipInfo fn

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java
index 082fb0c..8e0556f 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java
@@ -11,7 +11,7 @@
 import com.matrix.system.hive.bean.*;
 import com.matrix.system.hive.dao.*;
 import com.matrix.system.hive.plugin.util.CollectionUtils;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
 import com.matrix.system.hive.plugin.util.MoneyUtil;
 import com.matrix.system.hive.service.SysProjUseService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -153,7 +153,7 @@
                 contentZr.append("获取会员" + vipInfo.getVipName() + "的")
                         .append(",余额:" + projuse.getBalance())
                         .append(",余次:")
-                        .append(",有效期:" + DateUtils.dateToString(projuse.getFailTime(), DateUtils.DATE_FORMAT_MM))
+                        .append(",有效期:" + DateUtil.dateToString(projuse.getFailTime(), DateUtil.DATE_FORMAT_MM))
                         .append(",是否赠送:");
 
 
@@ -341,7 +341,7 @@
                         .append(",余次:" + cardUse.getLastCountName())
                         .append(",本金余额:" + MoneyUtil.add(cardUse.getRealMoney(), money))
                         .append(",赠送余额:" + cardUse.getGiftMoney())
-                        .append(",有效期:" + DateUtils.dateToString(cardUse.getFailTime(), DateUtils.DATE_FORMAT_MM))
+                        .append(",有效期:" + DateUtil.dateToString(cardUse.getFailTime(), DateUtil.DATE_FORMAT_MM))
                         .append(",是否赠送:" + cardUse.getSourceName());
                 content += contentBuild.toString();
 
@@ -463,7 +463,7 @@
         contentZr.append("获取会员" + vipInfo.getVipName() + "的" + shoppingGoods.getName())
                 .append(",余额:" + sysProjUse.getBalance())
                 .append(",余次:" + sysProjUse.getSurplusCount())
-                .append(",有效期:" + DateUtils.dateToString(sysProjUse.getFailTime(), DateUtils.DATE_FORMAT_MM))
+                .append(",有效期:" + DateUtil.dateToString(sysProjUse.getFailTime(), DateUtil.DATE_FORMAT_MM))
                 .append(",是否赠送:");
 
 
@@ -570,7 +570,7 @@
             content.append("到会籍卡(" + upCard.getCardName() + ")" + sysProjUse.getBalance() + "元")
                     .append(",余次:" + upCard.getLastCountName())
                     .append(",本金余额:" + upCard.getRealMoney())
-                    .append(",有效期:" + DateUtils.dateToString(upCard.getFailTime(), DateUtils.DATE_FORMAT_MM))
+                    .append(",有效期:" + DateUtil.dateToString(upCard.getFailTime(), DateUtil.DATE_FORMAT_MM))
                     .append(",是否赠送:" + upCard.getSourceName());
         } else {
             content.append("现金" + sysProjUse.getBalance() + "元");
@@ -616,7 +616,7 @@
         StringBuilder content = new StringBuilder();
         ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(proj.getProjId());
         content.append(shoppingGoods.getName() + "设置为有效")
-                .append(",有效期:" + DateUtils.dateToString(proj.getFailTime(), DateUtils.DATE_FORMAT_MM));
+                .append(",有效期:" + DateUtil.dateToString(proj.getFailTime(), DateUtil.DATE_FORMAT_MM));
 
 
         return new AjaxResult(AjaxResult.STATUS_SUCCESS, "操作成功");

--
Gitblit v1.9.1