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); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java index de3c76150..4c5af1554 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java @@ -18,6 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.text.DateFormat; @@ -46,7 +47,7 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserBasicSignMapper.findList(record)); } - @Transactional(rollbackFor = {Exception.class}) + @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Override public WxCUserBasicSign signIn(WxCUserBasicSign record) { if(record.getType() == null){ diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicSignMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicSignMapper.xml index ba3c6a880..ddab1de7a 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicSignMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicSignMapper.xml @@ -74,7 +74,7 @@