From 7aa9607492e2c0b70838c53083f5362e49e74f44 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 26 九月 2023 21:39:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 20c6292..599d6d4 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -169,6 +169,16 @@
}
@Override
+ public Object changeState(AdvertisementChangeStateDTO dto) {
+ return appUserMapper.changeState(dto.getIds(),dto.getState());
+ }
+
+ @Override
+ public List<TAppUser> queryAPPUserByNameAndPhone(AppUserByNameAndPhoneDTO dto) {
+ return appUserMapper.queryAPPUserByNameAndPhone(dto);
+ }
+
+ @Override
public ClassInfoVo queryUserOfStus(Integer id) {
TAppUser tAppUser = this.baseMapper.selectById(id);
ClassInfoVo classInfoVo = new ClassInfoVo();
@@ -365,7 +375,7 @@
if(tAppUser.getState() == 2){
return ResultUtil.error("您的账号已被冻结", "");
}
- password = Md5Util.MD5Encode(password, null);
+// password = Md5Util.MD5Encode(password, null);
if(!tAppUser.getPassword().equals(password)){
return ResultUtil.error("账号密码错误", "");
}
@@ -794,6 +804,7 @@
commodity.setShopIds(mcsClient.queryPointMerStoreIds(vicinityGood.getId()));
break;
default:
+
break;
}
goods.add(commodity);
@@ -815,6 +826,7 @@
}
commodity.setBelongsType(allCoupon.getUserPopulation());
commodity.setGoodsType(4);
+ commodity.setShopIds(ucponClient.getCouponStoreIds(allCoupon.getId()));
commodity.setNums(ucponClient.getRedeemedQuantity(allCoupon.getId()));
goods.add(commodity);
}
--
Gitblit v1.7.1