diff --git a/yudao-module-mall/yudao-module-shop-biz/pom.xml b/yudao-module-mall/yudao-module-shop-biz/pom.xml index 9ed68ff68..93831ac83 100644 --- a/yudao-module-mall/yudao-module-shop-biz/pom.xml +++ b/yudao-module-mall/yudao-module-shop-biz/pom.xml @@ -75,17 +75,5 @@ com.github.pagehelper pagehelper-spring-boot-starter - - cn.iocoder.boot - yudao-module-member-biz - 1.7.2-snapshot - compile - - - cn.iocoder.boot - yudao-module-system-biz - 1.7.2-snapshot - compile - \ No newline at end of file diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderInfoServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderInfoServiceImpl.java index eca336b87..fd969b759 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderInfoServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderInfoServiceImpl.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.shop.service.order.impl; +import cn.hutool.json.JSONUtil; import cn.iocoder.yudao.module.shop.dal.dataobject.order.StoreOrderInfo; import cn.iocoder.yudao.module.shop.dal.mysql.order.StoreOrderInfoMapper; import cn.iocoder.yudao.module.shop.service.order.StoreOrderInfoService; @@ -7,7 +8,6 @@ import cn.iocoder.yudao.module.shop.service.product.StoreProductReplyService; import cn.iocoder.yudao.module.shop.vo.order.OrderInfoDetailVo; import cn.iocoder.yudao.module.shop.vo.order.StoreOrderInfoOldVo; import cn.iocoder.yudao.module.shop.vo.order.StoreOrderInfoVo; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -58,7 +58,7 @@ public class StoreOrderInfoServiceImpl extends ServiceImpl 0) { @@ -303,7 +299,7 @@ public class StoreOrderServiceImpl extends ServiceImpl { updateById(storeOrder); @@ -1266,7 +1262,7 @@ public class StoreOrderServiceImpl extends ServiceImpl" + storeOrder); return Boolean.FALSE; @@ -159,7 +156,7 @@ public class StoreOrderTaskServiceImpl implements StoreOrderTaskService { storeOrderStatusService.saveRefund(storeOrder.getId(), storeOrder.getRefundPrice(), "成功"); // 更新用户数据 - memberUserMapper.updateById(user); + memberUserApi.updateById(user); // 回滚库存 rollbackStock(storeOrder); diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/wechat/WechatNewService.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/wechat/WechatNewService.java deleted file mode 100644 index a0c4975c1..000000000 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/wechat/WechatNewService.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.iocoder.yudao.module.shop.service.wechat; - -import cn.iocoder.yudao.module.shop.controller.admin.order.vo.WxRefundResponseVo; -import cn.iocoder.yudao.module.shop.controller.admin.order.vo.WxRefundVo; - -/** - * 微信公用服务 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -public interface WechatNewService { - - /** - * 微信申请退款 - * @param wxRefundVo 微信申请退款对象 - * @param path 商户p12证书绝对路径 - * @return 申请退款结果对象 - */ - WxRefundResponseVo payRefund(WxRefundVo wxRefundVo, String path); - -} diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/wechat/impl/WechatNewServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/wechat/impl/WechatNewServiceImpl.java deleted file mode 100644 index aa21dfb0d..000000000 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/wechat/impl/WechatNewServiceImpl.java +++ /dev/null @@ -1,102 +0,0 @@ -package cn.iocoder.yudao.module.shop.service.wechat.impl; - -import cn.iocoder.yudao.framework.common.exception.ServiceException; -import cn.iocoder.yudao.module.shop.constants.WeChatConstants; -import cn.iocoder.yudao.module.shop.controller.admin.order.vo.WxRefundResponseVo; -import cn.iocoder.yudao.module.shop.controller.admin.order.vo.WxRefundVo; -import cn.iocoder.yudao.module.shop.service.wechat.WechatNewService; -import cn.iocoder.yudao.module.shop.utils.CrmebUtil; -import cn.iocoder.yudao.module.shop.utils.RedisUtil; -import cn.iocoder.yudao.module.shop.utils.RestTemplateUtil; -import cn.iocoder.yudao.module.shop.utils.XmlUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.HashMap; - -/** - * 微信公用服务实现类 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Service -public class WechatNewServiceImpl implements WechatNewService { - private static final Logger logger = LoggerFactory.getLogger(WechatNewServiceImpl.class); - - @Autowired - private RedisUtil redisUtil; - - @Autowired - private RestTemplateUtil restTemplateUtil; - - - /** - * 微信申请退款 - * @param wxRefundVo 微信申请退款对象 - * @param path 商户p12证书绝对路径 - * @return 申请退款结果对象 - */ - @Override - public WxRefundResponseVo payRefund(WxRefundVo wxRefundVo, String path) { - String xmlStr = XmlUtil.objectToXml(wxRefundVo); - String url = WeChatConstants.PAY_API_URL + WeChatConstants.PAY_REFUND_API_URI_WECHAT; - HashMap map = new HashMap<>(); - String xml = ""; - try { - xml = restTemplateUtil.postWXRefundXml(url, xmlStr, wxRefundVo.getMch_id(), path); - map = XmlUtil.xmlToMap(xml); - } catch (Exception e) { - e.printStackTrace(); - throw new ServiceException("xmlToMap错误，xml = " + xml); - } - if (null == map) { - throw new ServiceException("微信无信息返回，微信申请退款失败！"); - } - - WxRefundResponseVo responseVo = CrmebUtil.mapToObj(map, WxRefundResponseVo.class); - if (responseVo.getReturnCode().toUpperCase().equals("FAIL")) { -// wxPayExceptionDispose(map, "微信申请退款异常1"); - throw new ServiceException("微信申请退款失败1！" + responseVo.getReturnMsg()); - } - - if (responseVo.getResultCode().toUpperCase().equals("FAIL")) { -// wxPayExceptionDispose(map, "微信申请退款业务异常"); - throw new ServiceException("微信申请退款失败2！" + responseVo.getErrCodeDes()); - } - System.out.println("================微信申请退款结束========================="); - return responseVo; - } - - /** - * 微信支付异常处理 - * @param map 微信返回数据 - * @param remark 备注 - */ -// private void wxPayExceptionDispose(HashMap map, String remark) { -// WechatExceptions wechatExceptions = new WechatExceptions(); -// String returnCode = (String) map.get("return_code"); -// if (returnCode.toUpperCase().equals("FAIL")) { -// wechatExceptions.setErrcode("-100"); -// wechatExceptions.setErrmsg(map.get("return_msg").toString()); -// } else { -// wechatExceptions.setErrcode(map.get("err_code").toString()); -// wechatExceptions.setErrmsg(map.get("err_code_des").toString()); -// } -// wechatExceptions.setData(JSONObject.toJSONString(map)); -// wechatExceptions.setRemark(remark); -// wechatExceptions.setCreateTime(DateUtil.date()); -// wechatExceptions.setUpdateTime(DateUtil.date()); -// wechatExceptionsService.save(wechatExceptions); -// } - -} - diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/CrmebUtil.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/CrmebUtil.java index 2715d1b30..054b02468 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/CrmebUtil.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/CrmebUtil.java @@ -2,8 +2,8 @@ package cn.iocoder.yudao.module.shop.utils; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; +import cn.hutool.json.JSONUtil; import cn.iocoder.yudao.framework.common.enums.Constants; -import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; import javax.crypto.Cipher; @@ -62,7 +62,7 @@ public class CrmebUtil { */ public static T mapToObj(HashMap map, Class clz){ if (map == null) return null; - return JSONObject.parseObject(JSONObject.toJSONString(map), clz); + return JSONUtil.toBean(JSONUtil.toJsonStr(map), clz); } /** diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/RestTemplateUtil.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/RestTemplateUtil.java deleted file mode 100644 index 9cf42f6b1..000000000 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/RestTemplateUtil.java +++ /dev/null @@ -1,111 +0,0 @@ -package cn.iocoder.yudao.module.shop.utils; - -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.config.RegistryBuilder; -import org.apache.http.conn.socket.ConnectionSocketFactory; -import org.apache.http.conn.socket.PlainConnectionSocketFactory; -import org.apache.http.conn.ssl.DefaultHostnameVerifier; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.conn.BasicHttpClientConnectionManager; -import org.apache.http.util.EntityUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; - -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import java.io.FileInputStream; -import java.security.KeyStore; -import java.security.SecureRandom; - - -/** - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - * httpClient 工具类 - */ - -@Component -public class RestTemplateUtil { - - @Autowired - private RestTemplate restTemplate; - - public static final String WXPAYSDK_VERSION = "WXPaySDK/3.0.9"; - public static final String USER_AGENT = WXPAYSDK_VERSION + - " (" + System.getProperty("os.arch") + " " + System.getProperty("os.name") + " " + System.getProperty("os.version") + - ") Java/" + System.getProperty("java.version") + " HttpClient/" + HttpClient.class.getPackage().getImplementationVersion(); - /** - * 发送POST-JSON请求(微信退款专用) - * - * @param url - * @return - */ - - public String postWXRefundXml(String url, String xml, String mchId, String path) throws Exception { - KeyStore clientStore = KeyStore.getInstance("PKCS12"); - // 读取本机存放的PKCS12证书文件 - FileInputStream instream = new FileInputStream(path); - try { - // 指定PKCS12的密码(商户ID) - clientStore.load(instream, mchId.toCharArray()); - } finally { - instream.close(); - } - - // 实例化密钥库 & 初始化密钥工厂 - KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); - kmf.init(clientStore, mchId.toCharArray()); - - // 创建 SSLContext - SSLContext sslContext = SSLContext.getInstance("TLS"); - sslContext.init(kmf.getKeyManagers(), null, new SecureRandom()); - - SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory( - sslContext, -// new String[]{"TLSv1"}, -// null, - new DefaultHostnameVerifier()); - - BasicHttpClientConnectionManager connManager = new BasicHttpClientConnectionManager( - RegistryBuilder.create() - .register("http", PlainConnectionSocketFactory.getSocketFactory()) - .register("https", sslConnectionSocketFactory) - .build(), - null, - null, - null - ); - - HttpClient httpClient = HttpClientBuilder.create() - .setConnectionManager(connManager) - .build(); - - HttpPost httpPost = new HttpPost(url); - - RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(8*1000).setConnectTimeout(6*1000).build(); - httpPost.setConfig(requestConfig); - - StringEntity postEntity = new StringEntity(xml, "UTF-8"); - httpPost.addHeader("Content-Type", "text/xml"); - httpPost.addHeader("User-Agent", USER_AGENT + " " + mchId); - httpPost.setEntity(postEntity); - - HttpResponse httpResponse = httpClient.execute(httpPost); - org.apache.http.HttpEntity httpEntity = httpResponse.getEntity(); - return EntityUtils.toString(httpEntity, "UTF-8"); - } - -} diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/WxPayUtil.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/WxPayUtil.java deleted file mode 100644 index 4c8e1bd2a..000000000 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/WxPayUtil.java +++ /dev/null @@ -1,88 +0,0 @@ -package cn.iocoder.yudao.module.shop.utils; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.crypto.SecureUtil; -import cn.iocoder.yudao.module.shop.constants.PayConstants; -import cn.iocoder.yudao.module.shop.controller.admin.order.vo.WxRefundVo; -import com.alibaba.fastjson.JSONObject; -import org.apache.commons.codec.digest.DigestUtils; - -import java.util.Arrays; -import java.util.Map; -import java.util.Set; - -/** - * 微信支付工具类 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -public class WxPayUtil { - - /** - * 获取sign - * @param wxRefundVo 微信退款对象 - * @param signKey 微信签名key - * @return String - */ - public static String getSign(WxRefundVo wxRefundVo, String signKey) { - // 对象转map - Map map = JSONObject.parseObject(JSONObject.toJSONString(wxRefundVo), Map.class); - // map排序 - Set keySet = map.keySet(); - String[] keyArray = keySet.toArray(new String[keySet.size()]); - Arrays.sort(keyArray); - StringBuilder sb = new StringBuilder(); - for (String k : keyArray) { - if (k.equals(PayConstants.FIELD_SIGN)) { - continue; - } - if (ObjectUtil.isNotNull(map.get(k))) // 参数值为空，则不参与签名 - sb.append(k).append("=").append(map.get(k)).append("&"); - } - sb.append("key=").append(signKey); - String sign = SecureUtil.md5(sb.toString()).toUpperCase(); - System.out.println("sign ========== " + sign); - return sign; - } - - /** - * 获取sign - * @param map 待签名数据 - * @param signKey 微信签名key - * @return String - */ - public static String getSign(Map map, String signKey) { - // map排序 - Set keySet = map.keySet(); - String[] keyArray = keySet.toArray(new String[keySet.size()]); - Arrays.sort(keyArray); - StringBuilder sb = new StringBuilder(); - for (String k : keyArray) { - if (k.equals(PayConstants.FIELD_SIGN)) { - continue; - } - if (StrUtil.isNotBlank(map.get(k)) && map.get(k).trim().length() > 0) // 参数值为空，则不参与签名 - sb.append(k).append("=").append(map.get(k).trim()).append("&"); - } - sb.append("key=").append(signKey); - String sign = SecureUtil.md5(sb.toString()).toUpperCase(); - System.out.println("sign ========== " + sign); - return sign; - } - - /** - * 获取随机字符串，长度要求在32位以内。 - */ - public static String getNonceStr() { - return DigestUtils.md5Hex(CrmebUtil.getUuid() + CrmebUtil.randomCount(111111, 666666)); - } - -} diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/XmlUtil.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/XmlUtil.java deleted file mode 100644 index 6427c5d3a..000000000 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/XmlUtil.java +++ /dev/null @@ -1,95 +0,0 @@ -package cn.iocoder.yudao.module.shop.utils; - -import com.thoughtworks.xstream.XStream; -import com.thoughtworks.xstream.io.naming.NoNameCoder; -import com.thoughtworks.xstream.io.xml.Xpp3Driver; -import org.apache.commons.lang3.StringUtils; -import org.dom4j.Document; -import org.dom4j.DocumentException; -import org.dom4j.Element; -import org.dom4j.io.SAXReader; - -import javax.servlet.http.HttpServletRequest; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * XML 工具类 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -public class XmlUtil { - public static Map xmlToMap(HttpServletRequest request) { - Map map = new HashMap<>(); - SAXReader reader = new SAXReader(); - - InputStream in = null; - try { - in = request.getInputStream(); - Document doc = reader.read(in); - Element root = doc.getRootElement(); - List list = root.elements(); - for (Element element : list) { - map.put(element.getName(), element.getText()); - } - } catch (IOException | DocumentException e) { - e.printStackTrace(); - } finally { - try { - assert in != null; - in.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - return map; - } - - /** - * 将发送消息封装成对应的xml格式 - */ - public static HashMap xmlToMap(String strxml) throws Exception { - strxml = strxml.replaceFirst("encoding=\".*\"", "encoding=\"UTF-8\""); - - HashMap map = new HashMap<>(); - SAXReader reader = new SAXReader(); - InputStream inputStream = new ByteArrayInputStream(strxml.getBytes(StandardCharsets.UTF_8)); - - if (StringUtils.isBlank(strxml)) { - return null; - } - - Document document = reader.read(inputStream); - Element root = document.getRootElement(); - List list = root.elements(); - - for (Element e : list) { - map.put(e.getName(), e.getText()); - } - inputStream.close(); - - return map; - } - - /** - * 将发送消息封装成对应的xml格式 - */ - public static String objectToXml(Object object) { - XStream xstream = new XStream(new Xpp3Driver(new NoNameCoder())); //不需要转义 - xstream.alias("xml", object.getClass()); - return xstream.toXML(object); - } - -} diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApi.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApi.java index 6cbb781bf..4e9dd5e7f 100644 --- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApi.java +++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApi.java @@ -57,4 +57,11 @@ public interface MemberUserApi { */ MemberUserRespDTO getUserByMobile(String mobile); + /** + * 根据会员ID更新用户信息 + * @param member + * @return + */ + int updateById(MemberUserRespDTO member); + } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApiImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApiImpl.java index 37aee217e..b96ea9c31 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApiImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApiImpl.java @@ -44,4 +44,9 @@ public class MemberUserApiImpl implements MemberUserApi { return UserConvert.INSTANCE.convert2(userService.getUserByMobile(mobile)); } + @Override + public int updateById(MemberUserRespDTO member) { + return userService.updateById(UserConvert.INSTANCE.convert3(member)); + } + } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/UserConvert.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/UserConvert.java index 11d1d0087..a88a95e31 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/UserConvert.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/UserConvert.java @@ -17,6 +17,7 @@ public interface UserConvert { AppUserInfoRespVO convert(MemberUserDO bean); AdminUserInfoRespVO convertAdmin(MemberUserDO bean); MemberUserRespDTO convert2(MemberUserDO bean); + MemberUserDO convert3(MemberUserRespDTO bean); List convertList2(List list); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java index 8f8cbb4c4..01574cd03 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java @@ -109,4 +109,11 @@ public interface MemberUserService { */ PageResult findPageList(AdminUserQueryDTO queryDTO); + /** + * 根据会员ID更新用户信息 + * @param member + * @return + */ + int updateById(MemberUserDO member); + } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java index a2f497892..4769ff236 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java @@ -21,10 +21,9 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.validation.Valid; import java.io.InputStream; -import java.util.Collection; -import java.util.Date; -import java.util.List; import java.time.LocalDateTime; +import java.util.Collection; +import java.util.List; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP; @@ -159,6 +158,17 @@ public class MemberUserServiceImpl implements MemberUserService { PageResult commonLableEntityList = memberUserMapper.selectPage(queryDTO); return commonLableEntityList; } + + /** + * 根据会员ID更新用户信息 + * @param member + * @return + */ + @Override + public int updateById(MemberUserDO member) { + return memberUserMapper.updateById(member); + } + /** * 对密码进行加密 *