From ed55b07e0000d99d0aeb796649077d178256fbb8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 09 Jan 2021 17:17:08 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java
index 5241736..2b18447 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java
@@ -23,7 +23,7 @@
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.VipAnswerDao;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.pojo.RegisterInfo;
import com.matrix.system.hive.service.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -341,7 +341,7 @@
public @ResponseBody
AjaxResult register(RegisterInfo vipInfo) {
- vipInfo.setBirthday1(DateUtils.stringToDate(vipInfo.getVoBirthday(), "yyyy-MM-dd"));
+ vipInfo.setBirthday1(DateUtil.stringToDate(vipInfo.getVoBirthday(), "yyyy-MM-dd"));
vipInfo.setVipState(Dictionary.VIP_STATE_HY);
vipInfo.setStaffId(getMe().getSuId());
vipInfo.setShopId(getMe().getShopId());
@@ -448,15 +448,12 @@
int month = c.get(Calendar.MONTH) + 1;
//获取日
int day = c.get(Calendar.DATE);
- //生肖
- String sx = DateUtils.getYear(year);
//星座
- String xz = DateUtils.getConstellation(month, day);
+ String xz = DateUtil.getConstellation(month, day);
SysVipInfo vip = new SysVipInfo();
vip.setConstell(xz);
- vip.setAnimalSign(sx);
List<SysVipInfo> vipList = new ArrayList<SysVipInfo>();
vipList.add(vip);
return new AjaxResult(AjaxResult.STATUS_SUCCESS, vipList, 0);
--
Gitblit v1.9.1