ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -1,6 +1,7 @@ package com.ruoyi.account.controller; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
@@ -153,8 +153,11 @@ R<BaseSetting> baseSetting = baseSettingClient.getBaseSetting(7); BaseSetting data = baseSetting.getData(); if (data != null){ if (amount.compareTo(new BigDecimal(data.getContent())) < 0){ return R.fail("充值金额不能小于" + data.getContent() + "元"); String content = data.getContent(); if (!content.equals("-1")){ if (amount.compareTo(new BigDecimal(content)) > 0){ return R.fail("充值金额不能小于" + content + "元"); } } } LoginUser loginUserApplet = tokenService.getLoginUserApplet(); ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -286,6 +286,12 @@ if(null != appUser1 && appUser1.getStatus() == 2){ return R.fail("手机号已注册，请直接登录！"); } String avatar = registerAccount.getAvatar(); if (StringUtils.isEmpty(avatar)){ avatar = "http://qijishenghuiyuan.obs.cn-southwest-2.myhuaweicloud.com/admin/aedfbbb41280471f8d9fa7905298b65f.png"; } //如果手机号已注册，但是没有微信号，则将微信号添加到已有账户上 if(null != appUser1 && StringUtils.isEmpty(appUser1.getWxOpenid())){ appUser1.setWxOpenid(openid); @@ -293,7 +299,7 @@ appUser = appUser1; }else if(null == appUser){ appUser = new AppUser(); appUser.setAvatar(registerAccount.getAvatar()); appUser.setAvatar(avatar); appUser.setName(registerAccount.getName()); appUser.setPhone(registerAccount.getPhone()); appUser.setWxOpenid(openid); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -348,15 +348,22 @@ orderPageListVo.setGetCommission(reduce); String expressJson = orderPageListVo.getExpressJson(); // {"com":"zhongtong","num":"78853319672621"} JSONObject jsonObject = JSONObject.parseObject(expressJson); if (StringUtils.isNotEmpty(expressJson) && !expressJson.equals("NULL")){ JSONObject jsonObject = null; try { jsonObject = JSONObject.parseObject(expressJson); String companyName = ExpressCompanyMap.getCompanyNameByCode(jsonObject.getString("com")); orderPageListVo.setExpressCompany(companyName); orderPageListVo.setExpressNum(jsonObject.getString("num")); } catch (Exception e) { } String companyName = ExpressCompanyMap.getCompanyNameByCode(jsonObject.getString("com")); orderPageListVo.setExpressCompany(companyName); orderPageListVo.setExpressNum(jsonObject.getString("num")); } } return pageInfo.setRecords(list); } /**
