From 512a2f0fb09b663b8de19b5313c8bd5899f4f74b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 09:44:06 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java | 70 ++++++++++++----------------------
1 files changed, 25 insertions(+), 45 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 037fbd0..1c36562 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
@@ -3,7 +3,6 @@
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.matrix.biz.dao.BizUserDao;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.tools.DateUtil;
@@ -39,7 +38,7 @@
ScoreUseRecordDao scoreUseRecordDao;
@Autowired
- BizUserDao bizUserDao;
+ SysVipInfoDao sysVipInfoDao;
@Autowired
SysVipInfoDao vipInfoDao;
@@ -54,17 +53,15 @@
* 扣除用户积分
*/
@Transactional(rollbackFor = Exception.class)
- 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();
- }else if(vipId!=null){
- companyId= vipInfoDao.selectById(vipId).getCompanyId();
- }else{
- throw new IllegalArgumentException("vipId,openId必须有一个");
+ public void deductionScore(Long vipId,Long oprationUserId,Long shopId, Integer score, Long businessId, int type,String remark) {
+ Long companyId= vipInfoDao.selectById(vipId).getCompanyId();
+
+ String createBy=MatrixConstance.SYSTEM_USER;
+ if(oprationUserId!=null){
+ createBy=sysUsersDao.selectById(oprationUserId).getSuName();
}
- List<ScoreVipDetail> effectiveScoreList = scoreVipDetailDao.selectEffectiveScore(openId,null);
+ List<ScoreVipDetail> effectiveScoreList = scoreVipDetailDao.selectEffectiveScore(vipId);
for (ScoreVipDetail scoreVipDetail : effectiveScoreList) {
@@ -89,9 +86,13 @@
scoreVipDetailDao.updateById(scoreVipDetail);
score=Math.abs(surplus);
}
+
+
+
+
//新增扣除记录
- scoreUseRecord.setCreateBy(MatrixConstance.SYSTEM_USER);
- scoreUseRecord.setUpdateBy(MatrixConstance.SYSTEM_USER);
+ scoreUseRecord.setCreateBy(createBy);
+ scoreUseRecord.setUpdateBy(createBy);
scoreUseRecord.setCreateTime(DateTime.now());
scoreUseRecord.setUpdateTime(DateTime.now());
scoreUseRecord.setNowScore(scoreVipDetail.getRemainScore());
@@ -101,9 +102,9 @@
scoreUseRecord.setRecNum(-currentDedution);
scoreUseRecord.setType(type);
scoreUseRecord.setShopId(shopId);
- scoreUseRecord.setOpenId(openId);
scoreUseRecord.setVipId(vipId);
scoreUseRecord.setRemarks(remark);
+ scoreUseRecord.setOprationUserId(oprationUserId);
scoreUseRecordDao.insert(scoreUseRecord);
if(surplus > 0 || surplus == 0){
@@ -119,15 +120,9 @@
* 新增用户积分
*/
@Transactional(rollbackFor = Exception.class)
- 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();
- }else if(vipId!=null){
- companyId= vipInfoDao.selectById(vipId).getCompanyId();
- }else{
- throw new IllegalArgumentException("vipId,openId必须有一个");
- }
+ public void addScore(Long vipId, Long oprationUserId,Long shopId, Integer score, Long businessId, int type,String remark) {
+ Long companyId= vipInfoDao.selectById(vipId).getCompanyId();
+
if(score<0){
throw new IllegalArgumentException("score必须有为大于零的数");
}
@@ -155,7 +150,6 @@
scoreVipDetail.setUsedScore(0);
scoreVipDetail.setBusinessId(businessId);
scoreVipDetail.setValiditeTime(sxys);
- scoreVipDetail.setOpenId(openId);
scoreVipDetail.setVipId(vipId);
scoreVipDetail.setGainTime(DateTime.now());
scoreVipDetail.setAllScore(score);
@@ -176,7 +170,6 @@
scoreUseRecord.setBusinessId(businessId);
scoreUseRecord.setRecNum(score);
scoreUseRecord.setType(type);
- scoreUseRecord.setOpenId(openId);
scoreUseRecord.setVipId(vipId);
scoreUseRecord.setShopId(shopId);
scoreUseRecord.setOprationUserId(oprationUserId);
@@ -189,19 +182,13 @@
/**
* 退积分
*/
- public void refundScore(String openId, Long vipId, Integer score, 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必须有一个");
- }
+ public void refundScore(Long vipId, Integer score, Long oldBusinessId, int type){
+
+ Long companyId= vipInfoDao.selectById(vipId).getCompanyId();
+
if(score<0){
throw new IllegalArgumentException("score必须有为大于零的数");
}
-
//查询原始使用记录
QueryWrapper queryWrapper=new QueryWrapper();
queryWrapper.eq("business_id",oldBusinessId);
@@ -224,22 +211,15 @@
});
}
- 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必须有一个");
- }
+ public void removeByBusinessId( Long vipId, Long oldBusinessId){
+ Long companyId= vipInfoDao.selectById(vipId).getCompanyId();
+
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);
}
--
Gitblit v1.9.1