Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccountInfoQueryParam.java

@@ -24,6 +24,7 @@ public class AccountInfoQueryParam extends BaseEntity {
    @ApiModelProperty("结束时间")
    private LocalDateTime endDateTime;
    private String searchValue;
+   private Integer userType;
 //   @ApiModelProperty("钱包最小金额")
 //   private BigDecimal walletMinAmount;
 //   @ApiModelProperty("钱包最大金额")

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccInfoDetailsVO.java

@@ -1,6 +1,7 @@
 package com.bonus.canteen.core.account.domain.vo;
 
 import com.bonus.common.core.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -35,6 +36,7 @@ public class AccInfoDetailsVO {
    private Long deptId;
    @ApiModelProperty("用户类别(展示)")
    @Excel(name = "用户类别(展示)")
+   @JsonIgnore
    private String userTypeName;
    @ApiModelProperty("账户总余额")
    @Excel(name = "账户总余额")

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml

@@ -433,6 +433,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </foreach>
             <if test="accountInfoQueryParam.searchValue != null and accountInfoQueryParam.searchValue != ''">
                 and (t2.nick_name like CONCAT('%',#{accountInfoQueryParam.searchValue},'%')
+                or t2.user_id like CONCAT('%',#{accountInfoQueryParam.searchValue},'%')
                 or t2.phonenumber = #{encryptedSearchValue}
                 )
             </if>
@@ -448,6 +449,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="accountInfoQueryParam.endDateTime != null">
                 and t1.update_time <![CDATA[ <= ]]> #{accountInfoQueryParam.endDateTime}
             </if>
+            <if test="accountInfoQueryParam.userType != null">
+                and t2.user_type = #{accountInfoQueryParam.userType}
+            </if>
             <if test="accountInfoQueryParam.walletType != null">
                 AND EXISTS(
                 SELECT null FROM

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationHistoryMapper.xml

@@ -37,6 +37,7 @@
             <if test="param.searchValue != null and param.searchValue != '' ">
                 and (su.nick_name like CONCAT('%',#{param.searchValue},'%') 
                 or su.phonenumber = #{encryptedSearchValue}
+                or su.user_id like CONCAT('%',#{param.searchValue},'%')
                 )
             </if>
         </where>