From 9852206ac03172278a23cb09ff5cecd6e45f4ad2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 24 Mar 2021 17:41:34 +0800
Subject: [PATCH] 分销设置自购返佣
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopScoreAction.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopScoreAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopScoreAction.java
index 03b6454..9dc6cea 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopScoreAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopScoreAction.java
@@ -6,10 +6,9 @@
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.system.score.dao.ScoreUseRecordDao;
-import com.matrix.system.score.entity.ScoreUseRecord;
+import com.matrix.system.score.dao.ScoreVipDetailDao;
import com.matrix.system.shopXcx.api.dto.ScoreFlowDto;
import com.matrix.system.shopXcx.api.vo.ScoreUseRecordVo;
-import com.matrix.system.shopXcx.vo.SalesOrderVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -36,12 +35,15 @@
@Autowired
ScoreUseRecordDao scoreUseRecordDao;
+ @Autowired
+ ScoreVipDetailDao scoreVipDetailDao;
+
@ApiOperation(value = "获取积分流水", notes = "")
- @PostMapping(value = "/getOrderList")
+ @PostMapping(value = "/getFlowList")
@ApiResponses({
@ApiResponse(code = 200, message = "ok", response = ScoreUseRecordVo.class)
})
- AjaxResult getInvitationuserList(@RequestBody @Validated ScoreFlowDto scoreFlowDto) {
+ AjaxResult getFlowList(@RequestBody @Validated ScoreFlowDto scoreFlowDto) {
BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
Page<ScoreUseRecordVo> page=new Page<>(scoreFlowDto.getPageNum(),scoreFlowDto.getPageSize());
scoreFlowDto.setUserId(loginUser.getOpenId());
@@ -50,6 +52,16 @@
return result;
}
+ @ApiOperation(value = "获取用户积分", notes = "")
+ @PostMapping(value = "/getUserScore")
+ @ApiResponses({
+ @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));
+ return result;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1