diff --git a/suimangCApi/src/main/java/com/iformall/controller/UserLiveController.java b/suimangCApi/src/main/java/com/iformall/controller/UserLiveController.java index 91a228d..dcf8ebf 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/UserLiveController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/UserLiveController.java @@ -77,6 +77,7 @@ public class UserLiveController extends BaseController { @Autowired private WxCUserAuthorityService wxCUserAuthorityService; + @Autowired private VoiceInfoService voiceInfoService; diff --git a/suimangService/src/main/java/com/iformall/domain/po/UserLevelCreditLog.java b/suimangService/src/main/java/com/iformall/domain/po/UserLevelCreditLog.java new file mode 100644 index 0000000..0f9430f --- /dev/null +++ b/suimangService/src/main/java/com/iformall/domain/po/UserLevelCreditLog.java @@ -0,0 +1,61 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.util.Date; +import java.util.List; + +@TableName(value = "user_level_credit_log") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class UserLevelCreditLog extends TenantEntity { + + protected Long id; + + @io.swagger.annotations.ApiModelProperty(value="",name="userId") + private Long userId; + + @io.swagger.annotations.ApiModelProperty(value="EnumProject ",name="projectType") + private Integer projectType; + + @io.swagger.annotations.ApiModelProperty(value="EnumPropertyLogType ",name="type") + private Integer type; + + @io.swagger.annotations.ApiModelProperty(value="",name="befourCredit") + private Integer befourCredit; + + @io.swagger.annotations.ApiModelProperty(value="",name="cieditNum") + private Integer creditNum; + + @io.swagger.annotations.ApiModelProperty(value="",name="afterCredit") + private Integer afterCredit; + + @io.swagger.annotations.ApiModelProperty(value="记录对应的业务ID",name="extraId") + private Long extraId; + + @io.swagger.annotations.ApiModelProperty(value="",name="remark") + private String remark; + + @io.swagger.annotations.ApiModelProperty(value="",name="detail") + private String detail; + + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="",name="extraIds") + private List extraIds; + + @TableField(exist = false) + private Date startDate; + + @TableField(exist = false) + private Date endDate; + +} diff --git a/suimangService/src/main/java/com/iformall/mapper/UserLevelCreditLogMapper.java b/suimangService/src/main/java/com/iformall/mapper/UserLevelCreditLogMapper.java new file mode 100644 index 0000000..585cd54 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/mapper/UserLevelCreditLogMapper.java @@ -0,0 +1,12 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.UserLevelCreditLog; + +import java.util.List; + +public interface UserLevelCreditLogMapper extends CommonMapper{ + + List findList(UserLevelCreditLog record); + +} diff --git a/suimangService/src/main/java/com/iformall/service/impl/WxCUserAuthorityServiceImpl.java b/suimangService/src/main/java/com/iformall/service/impl/WxCUserAuthorityServiceImpl.java index 1c823fc..2094de3 100644 --- a/suimangService/src/main/java/com/iformall/service/impl/WxCUserAuthorityServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/impl/WxCUserAuthorityServiceImpl.java @@ -20,7 +20,6 @@ public class WxCUserAuthorityServiceImpl implements WxCUserAuthorityService { @Override public Map getAuthor(Long id, String code, Integer type, Long resourceId) { - HashMap authorVos = new HashMap<>(); List resultList = new ArrayList(); if (type == 0) { diff --git a/suimangService/src/main/resources/mapper/UserLevelCreditLogMapper.xml b/suimangService/src/main/resources/mapper/UserLevelCreditLogMapper.xml new file mode 100644 index 0000000..03a243d --- /dev/null +++ b/suimangService/src/main/resources/mapper/UserLevelCreditLogMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`parent_tenant_id`,`user_id`, + `project_type`,`type`,`befour_credit`,`credit_num`,`after_credit`, + `extra_id`,`remark`,`detail`,`create_date` + + + + where 1 = 1 + and `id` = #{id} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + and `user_id` = #{userId} + and `project_type` = #{projectType} + and `type` = #{type} + + and `extra_id` = #{extraId} + + + + and `create_date` >= #{startDate} + + + and `create_date` <= #{endDate} + + + + and id in + + #{idItem} + + + + + and extra_id in + + #{extIdItem} + + + order by ${sortColumns} + + + + +