ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
@@ -20,7 +20,7 @@ public interface OtherClient { @GetMapping(value = "/integral/getSetBySiteId") R<TIntegralRule> getSetBySiteId(@RequestParam("id") Integer id); R<TIntegralRule> getSetBySiteId(@RequestParam("siteId") Integer siteId); @GetMapping(value = "/integral/saveIntegralRecord") R saveIntegralRecord(@RequestBody IntegralRecord record);
@@ -89,7 +89,12 @@ public R resetPassword(SysUser user) { return R.fail("重置用户密码失败:" + cause.getMessage()); } @Override public R siteResetPassword(SysUser user) { return R.fail("重置站点用户密码失败:" + cause.getMessage()); } @Override public R saveShopUser(SysUser user) { return R.fail("新增加门店员工账号数据失败：" + cause.getMessage()); ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -101,7 +101,14 @@ */ @PostMapping("/user/resetPassword") R resetPassword(@RequestBody SysUser user); /** * 重置站点用户密码 * @param user * @return */ @PostMapping("/user/siteResetPassword") R siteResetPassword(@RequestBody SysUser user); /** * 新增加门店员工账号数据 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -619,6 +619,15 @@ userService.resetPwd(user); return R.ok(); } @ResponseBody @PostMapping("/siteResetPassword") public R siteResetPassword(@RequestBody SysUser user) { user.setPassword(SecurityUtils.encryptPassword(MD5Generator.generateMD5(user.getPassword()))); user.setUpdateBy(SecurityUtils.getUsername()); userService.resetPwd(user); return R.ok(); } @ResponseBody ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
@@ -172,7 +172,8 @@ } if(Objects.nonNull(sysUser) && sysUser.getUserName().equals(dto.getAccount())) { // 修改密码 R res = sysUserClient.resetPassword(sysUser); sysUser.setPassword(dto.getPassword()); R res = sysUserClient.siteResetPassword(sysUser); } this.updateById(dto); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java
@@ -346,6 +346,9 @@ public R importData(ChargeOrder chargeOrder) { Site site = siteClient.getSiteAll().getData().stream().filter(e -> e.getId() .equals(chargeOrder.getPowerStationId())).findFirst().orElse(null); // 扣除站点系统用户的积分数 List<SysUser> data = sysUserClient.getSysUserAll().getData(); SysUser sysUser = data.stream().filter(e -> site.getId().equals(e.getSiteId())).findFirst().orElse(null); Integer point=0; AppUser appuser = appUserClient.getAppUserByPhone1(chargeOrder.getPhone()).getData(); //获取用户,更改积分数 @@ -361,6 +364,20 @@ appuser.setDelFlag(false); appuser.setName(appuser.getPhone().substring(0, 3) + "****" + appuser.getPhone().substring(7)); } if (site==null){ //先计算出积分数 point = getPoint(chargeOrder.getTotalAmount()); }else{ point = getPointSite(chargeOrder.getTotalAmount(),site.getId()); } if (sysUser != null) { if (sysUser.getIntegral()< point){ return R.fail("站点积分不足"); } }else { return R.fail("站点用户不存在"); } Integer chargePoint=appuser.getRechargePoint()==null?0:appuser.getRechargePoint();//充值积分 Integer availablePoint=appuser.getAvailablePoint()==null?0:appuser.getAvailablePoint();//可用积分 Integer totalPoint=appuser.getTotalPoint()==null?0:appuser.getTotalPoint();//总积分 @@ -372,10 +389,7 @@ if (userId==null){ return R.fail("导入订单-保存用户失败"); } if (site==null){ //先计算出积分数 point = getPoint(chargeOrder.getTotalAmount()); }else{ if (site!=null){ point = getPointSite(chargeOrder.getTotalAmount(),site.getId()); // 增加站点端积分明细 IntegralRecord integralRecord = new IntegralRecord(); @@ -387,18 +401,11 @@ integralRecord.setCreateTime(LocalDateTime.now()); otherClient.saveIntegralRecord(integralRecord); // 扣除站点系统用户的积分数 List<SysUser> data = sysUserClient.getSysUserAll().getData(); SysUser sysUser = data.stream().filter(e -> e.getSiteId().equals(site.getId())).findFirst().orElse(null); if (sysUser != null) { if (sysUser.getIntegral()==null){ sysUser.setIntegral(0); } if (sysUser.getIntegral()< point){ return R.fail("站点积分不足"); } sysUser.setIntegral(sysUser.getIntegral()==null?0:sysUser.getIntegral()-point); sysUserClient.updateSysUser(sysUser); if (sysUser.getIntegral()==null){ sysUser.setIntegral(0); } sysUser.setIntegral(sysUser.getIntegral()==null?0:sysUser.getIntegral()-point); sysUserClient.updateSysUser(sysUser); } //保存到数据库 chargeOrder.setPoint(point); @@ -473,7 +480,7 @@ throw new RuntimeException("获取积分兑换比例配置失败"); } if (org.springframework.util.StringUtils.hasLength(data.getChargeCredit())) { if (!org.springframework.util.StringUtils.hasLength(data.getChargeCredit())) { throw new RuntimeException("获取积分兑换比例配置失败"); } String chargeCredit = data.getChargeCredit(); ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/HttpUtils.java
New file @@ -0,0 +1,51 @@ package com.ruoyi.other.util; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.client.ClientProtocolException; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.DefaultHttpClient; import java.io.IOException; public class HttpUtils { private static ObjectMapper objectMapper = new ObjectMapper(); public static HttpResponse doPost(String url, JSONObject jsonData) { // 指定Post请求 HttpPost httpPost = new HttpPost(url); // 创建httpclient HttpClient httpClient = new DefaultHttpClient(); // 发送请求 HttpResponse httpResponse; // 返回的json JSONObject jsonObject = null; // 封装post请求数据 StringEntity entity = new StringEntity(jsonData.toString(), "utf-8"); httpPost.setEntity(entity); try { // 发送请求 httpResponse = httpClient.execute(httpPost); // 判断请求是否成功 if (httpResponse.getStatusLine().getStatusCode() == HttpStatus.SC_OK) { // 得到请求响应信息 // String str = EntityUtils.toString(httpResponse.getEntity(), "utf-8"); // 返回json // jsonObject = new JSONObject(Boolean.parseBoolean(str)); return httpResponse; } } catch (ClientProtocolException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } return null; } }
