From 2fbec1e4d088c7432430eba370575b3391cd2085 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 27 Jan 2021 18:07:53 +0800 Subject: [PATCH] qiandao sql --- .../controller/WxCreditHistoryController.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 433159586..adc5a609e 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -4,15 +4,13 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.WxCUser; -import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.po.WxCreditHistory; import com.iformall.enums.EnumScoreType; import com.iformall.enums.EnumUserType; import com.iformall.exception.MallinkException; import com.iformall.service.WxCreditHistoryService; +import com.iformall.service.WxScoreRulesService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -35,6 +33,9 @@ public class WxCreditHistoryController extends BaseController{ @Autowired private WxCreditHistoryService wxCreditHistoryService; + @Autowired + private WxScoreRulesService wxScoreRulesService; + @ApiOperation("用户积分列表") @GetMapping("list") @ApiImplicitParams({ @@ -92,4 +93,12 @@ public class WxCreditHistoryController extends BaseController{ } } + @ApiOperation("积分配置") + @GetMapping("/credit_rules") + public ResultData creditRulesList() { + logger.debug("[" + getIpAddr() + "] creditRulesList::list"); + WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(getTenantInfo().getFinalTenantId()); + return new ResultData(scoreRules); + } + }