From ad9b3c2ade43fbd3b2f2cd8af0653c58753591cc Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期四, 28 九月 2023 15:30:17 +0800
Subject: [PATCH] 9.26。14

---
 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java |    9 ++++++++-
 1 files changed, 8 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 9dcdaca..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
@@ -174,6 +174,11 @@
     }
 
     @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();
@@ -370,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("账号密码错误", "");
         }
@@ -799,6 +804,7 @@
                         commodity.setShopIds(mcsClient.queryPointMerStoreIds(vicinityGood.getId()));
                         break;
                     default:
+
                         break;
                 }
                 goods.add(commodity);
@@ -820,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