From 253f49b9983ed8d285afd3bc93004975ab1f6935 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Tue, 29 Apr 2025 09:19:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E7=8A=B6=E6=80=81-=E6=98=AF=E5=90=A6=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/canteen/core/account/domain/vo/AccInfoDetailsVO.java | 1 + .../canteen/core/account/service/impl/AccInfoServiceImpl.java | 3 ++- .../src/main/resources/mapper/account/AccInfoMapper.xml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccInfoDetailsVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccInfoDetailsVO.java index ff46f69..a69fdd9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccInfoDetailsVO.java +++ b/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; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java index ae1c6c4..a354a8c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java +++ b/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("账户不存在"); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml index 0b73d17..6ecd878 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml @@ -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, From ad7fe392f18210a193a32be5e4b9309ccf1a338a Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Tue, 29 Apr 2025 09:27:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/canteen/core/device/vo/DeviceFullInfoVO.java | 7 +++++++ .../src/main/resources/mapper/android/UserMapper.xml | 3 +-- .../resources/mapper/device/DoubleScreenMachineMapper.xml | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/vo/DeviceFullInfoVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/vo/DeviceFullInfoVO.java index 4180d49..3fa5274 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/vo/DeviceFullInfoVO.java +++ b/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 bindList; @ApiModelProperty("菜谱信息") diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml index c0b9186..a541356 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml +++ b/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 ai.del_flag = '2' AND su.update_time >= #{time} - INTERVAL 5 SECOND; @@ -31,7 +31,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND su.user_id = #{userId} - select count(1) from device_info - where (device_num like concat('%', #{keyWord}, '%') - or device_name like concat('%', #{keyWord}, '%') - or device_sn like concat('%', #{keyWord}, '%')) + where (device_num = #{keyWord} + or device_name = #{keyWord} + or device_sn = #{keyWord}) and device_id != #{deviceId} From 768e3eca51fe084506d1bf09f3fcf454c05c75bd Mon Sep 17 00:00:00 2001 From: gaowdong Date: Tue, 29 Apr 2025 09:41:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/account/AccInfoMapper.xml | 2 +- .../resources/mapper/account/AccOperationHistoryMapper.xml | 2 +- .../src/main/resources/mapper/account/AccTradeMapper.xml | 2 +- .../src/main/resources/mapper/report/AccReportMapper.xml | 4 ++-- .../src/main/resources/mapper/report/TradeReportMapper.xml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml index 6ecd878..6d32a6a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml +++ b/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} - and (t2.nick_name = #{accountInfoQueryParam.searchValue} + and (t2.nick_name like CONCAT('%',#{accountInfoQueryParam.searchValue},'%') or t2.phonenumber = #{encryptedSearchValue} ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationHistoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationHistoryMapper.xml index c31dfa7..654b9bf 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationHistoryMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationHistoryMapper.xml @@ -35,7 +35,7 @@ and aop.create_by like #{param.createBy} - and (su.nick_name = #{param.searchValue} + and (su.nick_name like CONCAT('%',#{param.searchValue},'%') or su.phonenumber = #{encryptedSearchValue} ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml index 3bdfd42..7c47403 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml @@ -264,7 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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},'%') ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml index d03b131..dc4aa29 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml +++ b/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 = ]]> #{param.startDateTime} and atwd.trade_time #{param.endDateTime} - and (su.nick_name = #{param.searchValue} + and (su.nick_name like CONCAT('%',#{param.searchValue},'%') or su.user_id like CONCAT('%',#{param.searchValue},'%') ) @@ -205,7 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where 1 = 1 - 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},'%') ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml index 5023659..2526943 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml @@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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" 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}, '%') )