From 293eb5045df36215f224f705a4adbb3e09570f51 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 09:44:02 +0800
Subject: [PATCH] 20210406 签到活动1
---
zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java
index b62012f..037fbd0 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java
+++ b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java
@@ -54,7 +54,7 @@
* 扣除用户积分
*/
@Transactional(rollbackFor = Exception.class)
- public void deductionScore(String openId, Long vipId,Long shopId, Integer score, Long businessId, int type) {
+ public void deductionScore(String openId, Long vipId,Long shopId, Integer score, Long businessId, int type,String remark) {
Long companyId=null;
if(openId!=null){
companyId= bizUserDao.findByOpenId(openId).getCompanyId();
@@ -99,10 +99,11 @@
scoreUseRecord.setScoreVipDetailId(scoreVipDetail.getId());
scoreUseRecord.setBusinessId(businessId);
scoreUseRecord.setRecNum(-currentDedution);
- scoreUseRecord.setRecType(type);
+ scoreUseRecord.setType(type);
scoreUseRecord.setShopId(shopId);
scoreUseRecord.setOpenId(openId);
scoreUseRecord.setVipId(vipId);
+ scoreUseRecord.setRemarks(remark);
scoreUseRecordDao.insert(scoreUseRecord);
if(surplus > 0 || surplus == 0){
@@ -141,7 +142,7 @@
Calendar cal=Calendar.getInstance();
int year = cal.get(Calendar.YEAR);
int sxYear=year+(Integer.parseInt(yxqSetting.getParamValue())-1);
- Date sxys=DateUtil.stringToDate(year+"-12-31 23:59",DateUtil.DATE_FORMAT_MM );
+ Date sxys=DateUtil.stringToDate(sxYear+"-12-31 23:59",DateUtil.DATE_FORMAT_MM );
ScoreVipDetail scoreVipDetail=new ScoreVipDetail();
--
Gitblit v1.9.1