From 3e2946b8bd06e81d633bf154da1eb84b3537d148 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 04 Feb 2021 10:31:02 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java | 20 ++++----------------
1 files changed, 4 insertions(+), 16 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..f2ed540 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;
@@ -117,16 +117,7 @@
// 在session存放当前查询的客户
MoneyCardUse cardUseInfo = cardUseService.findByVipId(vips.get(0).getId());
if (cardUseInfo == null) {
- cardUseInfo = new MoneyCardUse();
- cardUseInfo.setVipId(vips.get(0).getId());
- cardUseInfo.setCardName("储值卡");
- cardUseInfo.setIsVipCar(Dictionary.FLAG_YES_Y);
- cardUseInfo.setRealMoney(0D);
- cardUseInfo.setGiftMoney(0D);
- cardUseInfo.setSource("-");
- cardUseInfo.setStatus(Dictionary.MONEYCARD_STATUS_YX);
- cardUseInfo.setFailTime(DateUtil.stringToDate("2050-01-01 00:00",DateUtil.DATE_FORMAT_MM));
- moneyCardUseDao.insert(cardUseInfo);
+ cardUseInfo=vipInfoService.addVipDefaultCard(vips.get(0).getId());
}
vips.get(0).setLevelCard(cardUseInfo);
WebUtil.getSession().setAttribute(SystemConstance.CURRENT_CUSTOMER, vips.get(0));
@@ -341,7 +332,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 +439,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