From 8da7ca5f5a5466c76b0d0abe23c7935e13e09136 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期六, 26 十一月 2022 12:50:34 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
index 2af73b7..6830495 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -225,7 +226,7 @@
@Override
public R<ConvenientMerchantVO> getUserMerchantInfoByAccount(String account) {
try {
- R<LoginUserInfoVO> loginUserInfoVOR = userService.getUserInfo(account + "_10");
+ R<LoginUserInfoVO> loginUserInfoVOR = userService.getUserInfo(account + "_5");
LoginUserInfoVO loginUserInfoVO =
JSONObject.parseObject(JSONObject.toJSONString(loginUserInfoVOR.getData()), LoginUserInfoVO.class);
@@ -248,6 +249,20 @@
}
@Override
+ public R<ConvenientMerchantVO> getMerchantInfoByAccount(String account) {
+ try {
+ List<ConvenientMerchantVO> merchantDetailByAccount = this.baseMapper.getMerchantDetailByAccount(account);
+ if (CollUtil.isEmpty(merchantDetailByAccount)){
+ return R.fail(500, "该账号不存在");
+ }
+ ConvenientMerchantVO convenientMerchantVO = merchantDetailByAccount.get(0);
+ return R.ok(convenientMerchantVO);
+ } catch (Exception e) {
+ return R.fail();
+ }
+ }
+
+ @Override
public R<ConvenientMerchantVO> getUserConvenientMerchantInfo(Long userId) {
ConvenientMerchantDO merchantDO = this.baseMapper.selectOne(new QueryWrapper<ConvenientMerchantDO>()
.lambda().eq(ConvenientMerchantDO::getUserId, userId));
--
Gitblit v1.7.1