From 5632ae9ae36760932c1aeb1b43f954c0367379f2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 29 Mar 2021 14:18:58 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 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 0c44570..9002b42 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){
@@ -118,7 +119,7 @@
* 新增用户积分
*/
@Transactional(rollbackFor = Exception.class)
- public void addScore(String openId, Long vipId, Long oprationUserId,Long shopId, Integer score, Long businessId, int type) {
+ public void addScore(String openId, Long vipId, Long oprationUserId,Long shopId, Integer score, Long businessId, int type,String remark) {
Long companyId=null;
if(openId!=null){
companyId= bizUserDao.findByOpenId(openId).getCompanyId();
@@ -152,6 +153,7 @@
scoreVipDetail.setState(ScoreVipDetail.SCORE_STATUS_YX);
scoreVipDetail.setRemainScore(score);
scoreVipDetail.setUsedScore(0);
+ scoreVipDetail.setBusinessId(businessId);
scoreVipDetail.setValiditeTime(sxys);
scoreVipDetail.setOpenId(openId);
scoreVipDetail.setVipId(vipId);
@@ -173,11 +175,12 @@
scoreUseRecord.setScoreVipDetailId(scoreVipDetail.getId());
scoreUseRecord.setBusinessId(businessId);
scoreUseRecord.setRecNum(score);
- scoreUseRecord.setRecType(type);
+ scoreUseRecord.setType(type);
scoreUseRecord.setOpenId(openId);
scoreUseRecord.setVipId(vipId);
scoreUseRecord.setShopId(shopId);
scoreUseRecord.setOprationUserId(oprationUserId);
+ scoreUseRecord.setRemarks(remark);
scoreUseRecordDao.insert(scoreUseRecord);
@@ -221,8 +224,23 @@
});
}
- public static void main(String[] args) {
- System.out.println(DateTime.now().isAfter(DateTime.of("2020-11-11 23:22","yyyy-MM-dd HH:mm")));
+ public void removeByBusinessId(String openId, Long vipId, Long oldBusinessId, int type){
+ Long companyId=null;
+ if(openId!=null){
+ companyId= bizUserDao.findByOpenId(openId).getCompanyId();
+ }else if(vipId!=null){
+ companyId= vipInfoDao.selectById(vipId).getCompanyId();
+ }else{
+ throw new IllegalArgumentException("vipId,openId必须有一个");
+ }
+ if(oldBusinessId==null){
+ throw new IllegalArgumentException("oldBusinessId必须有");
+ }
+ QueryWrapper queryWrapper=new QueryWrapper();
+ queryWrapper.eq("business_id",oldBusinessId);
+ queryWrapper.eq("company_id",companyId);
+ queryWrapper.eq("type",type);
+ scoreVipDetailDao.delete(queryWrapper);
+ scoreUseRecordDao.delete(queryWrapper);
}
-
}
\ No newline at end of file
--
Gitblit v1.9.1