From 53e0cba6de254a1d6f19d0287da0b212f4a5ae90 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 16 七月 2024 17:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
index 4aba8ec..0eb8606 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
@@ -2,6 +2,7 @@
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.hutool.core.date.DateUnit;
+import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.biz.zbom.model.IamUserRoleModel;
import com.doumee.biz.zbom.model.IamUserTypeModel;
@@ -25,7 +26,9 @@
import com.doumee.dao.business.SmsEmailMapper;
import com.doumee.dao.business.UsersMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.web.reqeust.EditUsersRequest;
import com.doumee.dao.web.reqeust.ContentShareImgDto;
import com.doumee.dao.web.response.AccountResponse;
import com.doumee.service.business.UsersService;
@@ -33,12 +36,15 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.interfaces.MPJBaseJoin;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.catalina.User;
import org.apache.commons.lang3.StringUtils;
import me.chanjar.weixin.common.error.WxErrorException;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.util.ThreadContext;
+import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -51,6 +57,8 @@
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+
+import static com.aliyun.api.internal.util.AliyunWebUtils.doGet;
/**
* 鍛樺伐淇℃伅琛⊿ervice瀹炵幇
@@ -148,6 +156,9 @@
.selectAs(Shop::getSecondType,Users::getShopSecType)
.selectAll(Users.class);
Utils.MP.blankToNull(pageWrap.getModel());
+ if (StringUtils.isNotBlank(pageWrap.getModel().getPhone())) {
+ queryWrapper.apply(" t.id in ( select c.USER_ID from customer_user c where c.phone = '"+pageWrap.getModel().getPhone()+"' ) ");
+ }
if (pageWrap.getModel().getId() != null) {
queryWrapper.eq(Users::getId, pageWrap.getModel().getId());
}
@@ -291,7 +302,6 @@
f.setQrcodeImgFull(path + f.getQrcodeImg());
}
}
-
}
return pageData;
}
@@ -687,10 +697,14 @@
if(StringUtils.isNotBlank(users.getCompanyQrcodeImg())){
users.setCompanyQrcodeImgFull(prefix + users.getCompanyQrcodeImg());
}
+ if(StringUtils.isBlank(users.getSlogans())){
+ users.setSlogans(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.ZBOM_CUSTOMIZED,Constants.USER_LABEL).getCode()));
+ }
if(Objects.nonNull(users.getDepartmentId())){
Shop shop = shopMapper.selectById(users.getDepartmentId());
if(Objects.nonNull(shop)){
users.setShopName(shop.getName());
+ users.setShopCity(shop.getProvinceName()+shop.getCityName()+shop.getAreaName());
if(StringUtils.isNotBlank(shop.getAddress())){
users.setShopAddress(shop.getAddress());
}else{
@@ -703,5 +717,48 @@
+ @Override
+ public void editUserInfo(EditUsersRequest editUsersRequest){
+ if(Objects.isNull(editUsersRequest)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Users users = usersMapper.selectById(editUsersRequest.getUserId());
+ if(Objects.isNull(users)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ //TODO 璋冭捣 涓彴鎺ュ彛
+ usersMapper.update(new UpdateWrapper<Users>()
+ .lambda()
+ .set(Users::getCardImg,"-") //閲嶇疆鍚嶇墖涓� -
+ .set(StringUtils.isNotBlank(editUsersRequest.getImgurl()),Users::getImgurl,editUsersRequest.getImgurl())
+ .set(StringUtils.isNotBlank(editUsersRequest.getName()),Users::getName,editUsersRequest.getName())
+ .set(StringUtils.isNotBlank(editUsersRequest.getPhone()),Users::getPhone,editUsersRequest.getPhone())
+ .set(StringUtils.isNotBlank(editUsersRequest.getCompanyQrcodeImg()),Users::getCompanyQrcodeImg,editUsersRequest.getCompanyQrcodeImg())
+ .set(StringUtils.isNotBlank(editUsersRequest.getQrcodeImg()),Users::getQrcodeImg,editUsersRequest.getQrcodeImg())
+ .set(StringUtils.isNotBlank(editUsersRequest.getSlogans()),Users::getSlogans,editUsersRequest.getSlogans())
+ .set(Objects.nonNull(editUsersRequest.getCostomerNum()),Users::getCostomerNum,editUsersRequest.getCostomerNum())
+ .set(Objects.nonNull(editUsersRequest.getJobDate()),Users::getJobDate,editUsersRequest.getJobDate())
+ .set(StringUtils.isNotBlank(editUsersRequest.getPhone()),Users::getPhone,editUsersRequest.getPhone())
+ .eq(Users::getId,editUsersRequest.getUserId()));
+ }
+
+
+
+ @Override
+ public void updWxMiniToken(){
+ DefaultWebSecurityManager manager = new DefaultWebSecurityManager();
+ ThreadContext.bind(manager);
+ String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_PERSONNEL).getCode();
+ String appSecret = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_SECRET_PERSONNEL).getCode();
+ //鐢熸垚寰俊token
+ String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+appId+"&secret="+appSecret;
+ String response = Constants.doGet(url,null);
+ JSONObject json = JSONObject.parseObject(response);
+ SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_TOKEN_PERSONNEL);
+ systemDictData.setCode(json.getString("access_token"));
+ systemDictData.setUpdateTime(new Date());
+ systemDictDataBiz.updateByIdNew(systemDictData);
+ }
+
}
--
Gitblit v1.9.3