Merge remote-tracking branch 'origin/master'

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

@@ -72,4 +72,5 @@ public class AccInfoDetailsVO {
    private BigDecimal frozenSub;
    @ApiModelProperty("物理卡号")
    private String serialNum;
+   private Integer delFlag;
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java

@@ -36,6 +36,7 @@ import com.bonus.canteen.core.pay.constants.PayTypeEnum;
 import com.bonus.canteen.core.user.domain.DeviceMqPersonalUpdateMessageDTO;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
+import com.bonus.common.houqin.constant.DelFlagEnum;
 import com.bonus.common.houqin.constant.LeCodeUseSceneEnum;
 import com.bonus.common.houqin.constant.SourceTypeEnum;
 import com.bonus.common.houqin.mq.constant.LeMqConstant;
@@ -362,7 +363,7 @@ public class AccInfoServiceImpl implements IAccInfoService {
     }
     @Override
     public void checkAccStatus(AccInfoDetailsVO accInfoVO) {
-        if (ObjectUtil.isNull(accInfoVO)) {
+        if (ObjectUtil.isNull(accInfoVO) || DelFlagEnum.DEL_TRUE.key().equals(accInfoVO.getDelFlag())) {
             throw new ServiceException("账户不存在");
         }
 

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/vo/DeviceFullInfoVO.java

@@ -123,6 +123,13 @@ public class DeviceFullInfoVO {
    private Integer gateDefaultAmount;
    @ApiModelProperty("设备状态")
    private String deviceState;
+   private String recipeName;
+   private String areaName;
+   private String areaId;
+   private String canteenName;
+   private String canteenId;
+   private String stallName;
+   private String stallId;
    @ApiModelProperty("绑定关系")
    private List<DeviceBindVO> bindList;
    @ApiModelProperty("菜谱信息")

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

@@ -432,7 +432,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{accStatus}
             </foreach>
             <if test="accountInfoQueryParam.searchValue != null and accountInfoQueryParam.searchValue != ''">
-                and (t2.nick_name = #{accountInfoQueryParam.searchValue}
+                and (t2.nick_name like CONCAT('%',#{accountInfoQueryParam.searchValue},'%')
                 or t2.phonenumber = #{encryptedSearchValue}
                 )
             </if>
@@ -526,6 +526,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT ai.acc_id,
         ai.user_id,
         ai.end_date,
+        ai.del_flag,
         ai.acc_status,
         su.nick_name,
         su.phonenumber,

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

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

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

@@ -264,7 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
             <if test="param.searchValue != null and param.searchValue != ''">
-                and (su.nick_name = #{param.searchValue}
+                and (su.nick_name like CONCAT('%',#{param.searchValue},'%')
                 or su.phonenumber = #{encryptedSearchValue}
                 or su.user_id like CONCAT('%',#{param.searchValue},'%')
                 )

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml

@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from sys_user su
         left join acc_card ac on ac.user_id = su.user_id
         left join acc_info ai on ai.user_id = su.user_id
-        <where>
+        where ai.del_flag = '2'
             <if test="type == 'user'">
                 <if test="time != null and time != ''">
                     AND su.update_time >= #{time} - INTERVAL 5 SECOND;
@@ -31,7 +31,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null and userId != '' and userId != 0 and userId != '0'">
                 AND su.user_id = #{userId}
             </if>
-        </where>
     </select>
     <select id="getMoneyList" resultType="com.bonus.canteen.core.android.vo.UserInfoVo">
         SELECT

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DoubleScreenMachineMapper.xml

@@ -148,9 +148,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="checkIsExist" resultType="java.lang.Integer">
         select count(1)
         from device_info
-        where (device_num like concat('%', #{keyWord}, '%')
+        where (device_num = #{keyWord}
-            or device_name like concat('%', #{keyWord}, '%')
+            or device_name = #{keyWord}
-            or device_sn like concat('%', #{keyWord}, '%'))
+            or device_sn = #{keyWord})
         <if test="deviceId != null and deviceId != ''">
             and device_id != #{deviceId}
         </if>

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and atwd.trade_time <![CDATA[ >= ]]> #{param.startDateTime}
           and atwd.trade_time <![CDATA[ <= ]]> #{param.endDateTime}
         <if test="param.searchValue != null and param.searchValue != ''">
-            and (su.nick_name = #{param.searchValue}
+            and (su.nick_name like CONCAT('%',#{param.searchValue},'%')
             or su.user_id like CONCAT('%',#{param.searchValue},'%')
             )
         </if>
@@ -205,7 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where
         1 = 1
         <if test="param.searchValue != null and param.searchValue != ''">
-            and (b.nick_name = #{param.searchValue}
+            and (b.nick_name like CONCAT('%',#{param.searchValue},'%')
             or b.phonenumber = #{encryptedSearchValue}
             or c.user_id like CONCAT('%',#{param.searchValue},'%')
             )

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml

@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         <if test="param.searchValue != null and param.searchValue != ''">
             and (
-            su.nick_name = #{param.searchValue}
+            su.nick_name like CONCAT('%',#{param.searchValue},'%')
             or su.phonenumber = #{encryptedSearchValue}
             or su.user_id like concat('%', #{param.searchValue}, '%')
             )
@@ -311,7 +311,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         <if test="param.searchValue != null and param.searchValue != ''">
             and (
-            su.nick_name = #{param.searchValue}
+            su.nick_name like CONCAT('%',#{param.searchValue},'%')
             or su.phonenumber = #{encryptedSearchValue}
             or su.user_id like concat('%', #{param.searchValue}, '%')
             )