935090232@qq.com
2021-03-21 afa3a318dad2934722ff9c197be7b03eb3ebcf6a
扣除用户积分
7 files modified
73 ■■■■ changed files
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java 4 ●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java 4 ●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java 6 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java 40 ●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java 2 ●●● patch | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/score/ScoreVipDetailDao.xml 8 ●●●● patch | view | raw | blame | history
zq-erp/src/test/java/com/matrix/JyyTests.java 9 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java
@@ -22,8 +22,8 @@
    /**
     * 查询用户有效的积分,按时间顺序排
     * @param userId
     * @param
     * @return
     */
    List<ScoreVipDetail> selectEffectiveScore(String openId);
    List<ScoreVipDetail> selectEffectiveScore(String openId, Long vipId);
}
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java
@@ -65,9 +65,9 @@
    /**
     * 操作人ID
     */
    private String  openId;
    private Long  userId;
    private Long vipId;
    
    /**
     * 备注
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java
@@ -27,6 +27,12 @@
     * 获取类型(2:赠送等)
     */
    public static final int SCORE_VIP_TYPE_CONSUME=2;
    /** 有效*/
    public static final int SCORE_STATUS_YX=1;
    /** 无效*/
    public static final int SCORE_STATUS_WX=2;
    /**
     * 用户openId
zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java
@@ -2,15 +2,17 @@
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.matrix.biz.bean.BizUser;
import com.matrix.biz.dao.BizUserDao;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
import com.matrix.system.hive.dao.SysVipInfoDao;
import com.matrix.system.score.dao.ScoreUseRecordDao;
import com.matrix.system.score.dao.ScoreVipDetailDao;
import com.matrix.system.score.entity.ScoreUseRecord;
import com.matrix.system.score.entity.ScoreVipDetail;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -31,6 +33,9 @@
    @Autowired
    BizUserDao bizUserDao;
    @Autowired
    SysVipInfoDao vipInfoDao;
    /**
     * 扣除用户积分
     *
@@ -39,15 +44,23 @@
     * @param businessId
     * @param type
     */
    public void deductionScore(String openId, Integer score, Long businessId, int type) {
        BizUser user = bizUserDao.findByOpenId(openId);
        List<ScoreVipDetail> effectiveScoreList = scoreVipDetailDao.selectEffectiveScore(openId);
    @Transactional(rollbackFor = Exception.class)
    public void deductionScore(String openId, Long vipId, Integer score, Long businessId, 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必须有一个");
        }
        List<ScoreVipDetail> effectiveScoreList = scoreVipDetailDao.selectEffectiveScore(openId,null);
        for (ScoreVipDetail scoreVipDetail : effectiveScoreList) {
            ScoreUseRecord scoreUseRecord = new ScoreUseRecord();
            scoreUseRecord.setPreScore(scoreVipDetail.getRemainScore());
            int surplus = scoreVipDetail.getRemainScore() - score;
            int currentDedution = 0;
@@ -55,10 +68,14 @@
                //余额充足
                currentDedution = score;
                scoreVipDetail.setRemainScore(surplus);
                if(surplus==0){
                    scoreVipDetail.setState(ScoreVipDetail.SCORE_STATUS_WX);
                }
                scoreVipDetailDao.updateById(scoreVipDetail);
                break;
                score=0;
            } else {
                currentDedution = scoreVipDetail.getRemainScore();
                scoreVipDetail.setState(ScoreVipDetail.SCORE_STATUS_WX);
                scoreVipDetail.setRemainScore(0);
                scoreVipDetailDao.updateById(scoreVipDetail);
                score=Math.abs(surplus);
@@ -69,12 +86,21 @@
            scoreUseRecord.setCreateTime(DateTime.now());
            scoreUseRecord.setUpdateTime(DateTime.now());
            scoreUseRecord.setNowScore(scoreVipDetail.getRemainScore());
            scoreUseRecord.setCompanyId(user.getCompanyId());
            scoreUseRecord.setCompanyId(companyId);
            scoreUseRecord.setScoreVipDetailId(scoreVipDetail.getId());
            scoreUseRecord.setBusinessId(businessId);
            scoreUseRecord.setRecNum(currentDedution);
            scoreUseRecord.setRecType(type);
            scoreUseRecord.setOpenId(openId);
            scoreUseRecord.setVipId(vipId);
            scoreUseRecordDao.insert(scoreUseRecord);
            if(surplus > 0 || surplus == 0){
                break;
            }
        }
        if(score>0){
            throw new GlobleException("积分不足");
        }
    }
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java
@@ -202,7 +202,7 @@
                            //扣除积分
                            if(order.getScorePay()!=null){
                                scoreVipDetailService.deductionScore(order.getUserId(),order.getScorePay(),Long.parseLong(order.getId()+""), ScoreVipDetail.SCORE_VIP_TYPE_CASH);
                                scoreVipDetailService.deductionScore(order.getUserId(),null,order.getScorePay(),Long.parseLong(order.getId()+""), ScoreVipDetail.SCORE_VIP_TYPE_CASH);
                            }
                            threadResult.putInMap("status", "success");
zq-erp/src/main/resources/mybatis/mapper/score/ScoreVipDetailDao.xml
@@ -18,7 +18,13 @@
    </select>
    <select id="selectEffectiveScore" resultType="com.matrix.system.score.entity.ScoreVipDetail">
        select  *  from score_vip_detail where open_id=#{openId} and  state=1 order by create_time
        select  *  from score_vip_detail where state=1
            <if test="openId !=null">
            and open_id=#{openId}
        </if>
            <if test="vipId !=null">
                and vip_id=#{vipId}
            </if>  order by create_time
    </select>
zq-erp/src/test/java/com/matrix/JyyTests.java
@@ -1,6 +1,7 @@
package com.matrix;
import com.matrix.system.score.dao.ScoreVipDetailDao;
import com.matrix.system.score.service.ScoreVipDetailService;
import com.matrix.system.shopXcx.dao.ShopOrderV2Dao;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -26,6 +27,14 @@
    @Autowired
    ScoreVipDetailDao scoreVipDetailDao;
    @Autowired
    ScoreVipDetailService scoreVipDetailService;
    @Test
    public void scoreVipDetailService() throws InterruptedException {
        scoreVipDetailService.deductionScore("oJkRK4yelehsY4S7I6Ee1ydWtQMI",null,15,1L,1);
    }
    /**
     *
     */