Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

935090232@qq.com

2021-05-08 6924e965ea3da70823f50f7285b50efab7205415

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopScoreAction.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.biz.bean.BizUser;
import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.system.score.dao.ScoreUseRecordDao;
@@ -44,9 +44,9 @@
            @ApiResponse(code = 200, message = "ok", response = ScoreUseRecordVo.class)
    })
    AjaxResult getFlowList(@RequestBody @Validated ScoreFlowDto scoreFlowDto) {
        BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        Page<ScoreUseRecordVo> page=new Page<>(scoreFlowDto.getPageNum(),scoreFlowDto.getPageSize());
        scoreFlowDto.setUserId(loginUser.getOpenId());
        scoreFlowDto.setVipId(loginUser.getId());
        IPage<ScoreUseRecordVo> shopScoreRecord = scoreUseRecordDao.selectFlowList(page,  scoreFlowDto);
        AjaxResult result=AjaxResult.buildSuccessInstance(shopScoreRecord.getRecords());
        return result;
@@ -58,8 +58,8 @@
            @ApiResponse(code = 200, message = "ok", response = AjaxResult.class)
    })
    AjaxResult getUserScore() {
        BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
        AjaxResult result=AjaxResult.buildSuccessInstance(scoreVipDetailDao.selectUserTotalScore(loginUser.getOpenId(),null));
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        AjaxResult result=AjaxResult.buildSuccessInstance(scoreVipDetailDao.selectUserTotalScore(loginUser.getId()));
        return result;
    }