From 472fc1b5980db8cd69c77a5c1bcb8aded3d3b3a6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 05 十一月 2024 19:05:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/CodeController.java | 19 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 57 +++---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java | 4
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TRepairServiceImpl.java | 16 +
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/FileController.java | 6
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java | 8 -
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 26 ++
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java | 4
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/CouponController.java | 5
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java | 24 +++
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/SwitchwayGateService.java | 2
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java | 28 +++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java | 40 +---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 24 ++
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 6
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 17 ++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 24 +-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java | 43 +++++
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java | 31 ++-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TVipService.java | 3
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/SendMessageDTO.java | 18 ++
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java | 12 +
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java | 12
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/CouponService.java | 4
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java | 3
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java | 14 +
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/config/FileUploadConfig.java | 21 ++
27 files changed, 341 insertions(+), 130 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/SendMessageDTO.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/SendMessageDTO.java
new file mode 100644
index 0000000..35293ff
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/SendMessageDTO.java
@@ -0,0 +1,18 @@
+package com.ruoyi.account.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(value = "发送短信dto类")
+public class SendMessageDTO implements Serializable {
+
+ private String phone;
+ private String code;
+ private String site;
+ private String chargeGun;
+ private Integer type;// 1 codeMsg 2 applyCodeMsg 3 faultMsg
+
+}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java
index d00fb80..b4cd200 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.api.factory;
import com.ruoyi.account.api.dto.GiveVipDto;
+import com.ruoyi.account.api.dto.SendMessageDTO;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.model.TAppUser;
@@ -91,6 +92,17 @@
public R<String> getWXToken() {
return R.fail("获取微信token失败：" + throwable.getMessage());
}
+
+ @Override
+ public R<Boolean> sensitiveWordDetection(String content, String openid) {
+ return R.fail("敏感词校验失败：" + throwable.getMessage());
+ }
+
+ @Override
+ public R<String> sendMessage(SendMessageDTO sendMessageDTO) {
+ return R.fail("短信发送失败：" + throwable.getMessage());
+ }
+
};
}
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
index 1646c54..904e7aa 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.api.feignClient;
import com.ruoyi.account.api.dto.GiveVipDto;
+import com.ruoyi.account.api.dto.SendMessageDTO;
import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.account.api.model.TAppUserAddress;
@@ -93,4 +94,20 @@
*/
@PostMapping("/wxLogin/getWXToken")
R<String> getWXToken();
+
+ /**
+ * 敏感词检测
+ * @param content
+ * @param openid
+ * @return
+ */
+ @PostMapping("/wxLogin/sensitiveWordDetection")
+ R<Boolean> sensitiveWordDetection (@RequestParam("content") String content, @RequestParam("openid") String openid);
+
+ /**
+ * 短信发送
+ * @return
+ */
+ @PostMapping("/t-app-user/sendMessage")
+ R<String> sendMessage(@RequestBody SendMessageDTO sendMessageDTO);
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/config/FileUploadConfig.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/config/FileUploadConfig.java
new file mode 100644
index 0000000..5975453
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/config/FileUploadConfig.java
@@ -0,0 +1,21 @@
+package com.ruoyi.account.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>文件上传配置</p>
+ *
+ * @author mouseyCat
+ * @date 2020/10/13 16:10
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "file.upload")
+public class FileUploadConfig {
+ private String accessPath;
+ private String allowExt;
+ private String location;
+ private String qrLocation;
+}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/FileController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/FileController.java
similarity index 96%
rename from ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/FileController.java
rename to ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/FileController.java
index 9baad05..9c04233 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/FileController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/FileController.java
@@ -1,6 +1,6 @@
-package com.ruoyi.chargingPile.controller;
+package com.ruoyi.account.controller;
-import com.ruoyi.chargingPile.config.FileUploadConfig;
+import com.ruoyi.account.config.FileUploadConfig;
import com.ruoyi.common.core.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -37,7 +37,6 @@
}
String TimeDir =new SimpleDateFormat("yyyy-MM-dd").format(new Date());
String realPath = fileUploadConfig.getLocation() + TimeDir;
-// String realPath = "D:\\file\\" + TimeDir;
File file = new File(realPath);
// 没有目录就创建
if (!file.exists()) {
@@ -57,7 +56,6 @@
mf.transferTo(targetFile);
//拼接数据
String imgstr = fileUploadConfig.getAccessPath() + TimeDir +"/"+ filename;
-// String imgstr = TimeDir +"/"+ filename;
return AjaxResult.success(imgstr);
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
index 789c6d3..e97b7bc 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -16,12 +16,11 @@
import com.ruoyi.account.util.carBrand.CarBrandUtil;
import com.ruoyi.account.wx.model.WeixinProperties;
import com.ruoyi.common.core.constant.Constants;
+import com.ruoyi.common.core.constant.MsgConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.PointChangeDto;
import com.ruoyi.common.core.enums.status.AppUserStatusEnum;
-import com.ruoyi.common.core.utils.JwtUtils;
-import com.ruoyi.common.core.utils.OrderCodeUtil;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.*;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.domain.BasePojo;
@@ -1183,5 +1182,24 @@
appUserService.updateById(appUser);
return AjaxResult.success();
}
+
+ @PostMapping("/sendMessage")
+ public R<String> sendMessage(@RequestBody SendMessageDTO sendMessageDTO){
+ switch (sendMessageDTO.getType()){
+ case 1:
+ String reqStr1 = MsgUtil.codeMsg(sendMessageDTO.getPhone(), sendMessageDTO.getCode());
+ String result1 = HttpUtils.post(MsgConstants.SEND_URL, reqStr1);
+ return R.ok(result1);
+ case 2:
+ String reqStr2 = MsgUtil.applyCodeMsg(sendMessageDTO.getPhone(), sendMessageDTO.getCode());
+ String result2 = HttpUtils.post(MsgConstants.SEND_URL, reqStr2);
+ return R.ok(result2);
+ default:
+ String reqStr3 = MsgUtil.faultMsg(sendMessageDTO.getPhone(), sendMessageDTO.getSite(), sendMessageDTO.getChargeGun());
+ String result3 = HttpUtils.post(MsgConstants.SEND_URL, reqStr3);
+ return R.ok(result3);
+ }
+ }
+
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java
index a3d64ac..6a25b2b 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.controller;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
import com.alipay.api.internal.util.codec.Base64;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -18,6 +19,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.FileUploadUtils;
+import com.ruoyi.common.core.utils.HttpUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.redis.service.RedisService;
@@ -179,4 +181,43 @@
String accessToken = appletTools.getAccessToken("");
return R.ok(accessToken);
}
+
+
+ /**
+ * 敏感词检测
+ * @param content
+ * @param openid
+ * @return
+ */
+ @PostMapping("/sensitiveWordDetection")
+ public R<Boolean> sensitiveWordDetection (@RequestParam("content") String content, @RequestParam("openid") String openid){
+ WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig, redisService);
+ String accessToken = appletTools.getAccessToken("");
+ com.alibaba.fastjson2.JSONObject jsonObject = new com.alibaba.fastjson2.JSONObject();
+ jsonObject.put("content", content);
+ jsonObject.put("version", 2);
+ jsonObject.put("scene", 2);
+ jsonObject.put("openid", openid);
+ String post = HttpUtils.post("https://api.weixin.qq.com/wxa/msg_sec_check?access_token=" + accessToken, jsonObject.toString());
+ com.alibaba.fastjson2.JSONObject object = com.alibaba.fastjson2.JSONObject.parseObject(post);
+ Integer errcode = object.getInteger("errcode");
+ if(0 != errcode){
+ throw new RuntimeException(object.getString("errmsg"));
+ }
+ JSONArray detail = object.getJSONArray("detail");
+ for (int i = 0; i < detail.size(); i++) {
+ JSONObject jsonObject1 = detail.getJSONObject(i);
+ Integer errcode1 = jsonObject1.getInteger("errcode");
+ if(0 == errcode1){
+ String suggest = jsonObject1.getString("suggest");
+ Integer label = jsonObject1.getInteger("label");
+ String keyword = jsonObject1.getString("keyword");
+ Integer prob = jsonObject1.getInteger("prob");
+ if(("risky".equals(suggest) || "review".equals(suggest)) && 100 != label && StringUtils.isNotEmpty(keyword) && 80 <= prob){
+ return R.ok(true);
+ }
+ }
+ }
+ return R.ok(false);
+ }
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/CodeController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/CodeController.java
index 3a24689..71006ef 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/CodeController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/CodeController.java
@@ -1,5 +1,6 @@
package com.ruoyi.chargingPile.controller;
+import com.ruoyi.account.api.dto.SendMessageDTO;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.chargingPile.api.model.TChargingPile;
@@ -48,8 +49,13 @@
}
String code = MsgUtil.createCode();
redisService.setCacheObject(phone+ Constants.UPDATE_PHONE,code,5L, TimeUnit.MINUTES);
- String reqStr = MsgUtil.codeMsg(phone, code);
- String result = HttpUtils.post(MsgConstants.SEND_URL, reqStr);
+ SendMessageDTO sendMessageDTO = new SendMessageDTO();
+ sendMessageDTO.setPhone(phone);
+ sendMessageDTO.setCode(code);
+ sendMessageDTO.setType(1);
+ String result = appUserClient.sendMessage(sendMessageDTO).getData();
+// String reqStr = MsgUtil.codeMsg(phone, code);
+// String result = HttpUtils.post(MsgConstants.SEND_URL, reqStr);
// 记录短信发送
chargingPileNotificationService.saveData(1,-1,-1,phone,"验证码："+code+"，用于更换手机号。请勿转发。");
return AjaxResult.success(result);
@@ -67,8 +73,13 @@
{
String code = MsgUtil.createCode();
redisService.setCacheObject(phone+ Constants.APPLY_CHARGING,code,5L, TimeUnit.MINUTES);
- String reqStr = MsgUtil.applyCodeMsg(phone, code);
- String result = HttpUtils.post(MsgConstants.SEND_URL, reqStr);
+ SendMessageDTO sendMessageDTO = new SendMessageDTO();
+ sendMessageDTO.setPhone(phone);
+ sendMessageDTO.setCode(code);
+ sendMessageDTO.setType(2);
+ String result = appUserClient.sendMessage(sendMessageDTO).getData();
+// String reqStr = MsgUtil.applyCodeMsg(phone, code);
+// String result = HttpUtils.post(MsgConstants.SEND_URL, reqStr);
// 记录短信发送
chargingPileNotificationService.saveData(1,-1,-1,phone,"验证码："+code+"，用于申请建桩。请勿转发。");
return AjaxResult.success(result);
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
index 1c1442d..a619468 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
@@ -1,8 +1,6 @@
package com.ruoyi.chargingPile.controller;
-import cn.hutool.core.img.ImgUtil;
-import cn.hutool.core.io.FileUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
@@ -10,7 +8,6 @@
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
-import com.ruoyi.chargingPile.api.model.TFaultMessage;
import com.ruoyi.chargingPile.api.query.TChargingGunQuery;
import com.ruoyi.chargingPile.api.vo.GetChargingGunByCode;
import com.ruoyi.chargingPile.api.vo.GunStatusStatisticsVO;
@@ -23,14 +20,11 @@
import com.ruoyi.chargingPile.util.QRCodeUtils;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.domain.BaseDelete;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.integration.api.feignClient.IntegrationClient;
-import com.ruoyi.integration.api.model.EndCharge;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -40,13 +34,11 @@
import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
-import java.awt.image.BufferedImage;
import java.io.*;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
/**
* <p>
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
index dcea1b1..2666ac1 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
@@ -306,8 +306,36 @@
StatusModeStatisticsVO statusModeStatistics1 = this.baseMapper.getStatusModeStatistics(siteIds,1);
StatusModeStatisticsVO statusModeStatistics2 = this.baseMapper.getStatusModeStatistics(siteIds,2);
StatusModeStatisticsVO statusModeStatistics3 = this.baseMapper.getStatusModeStatistics(siteIds,3);
+ if (statusModeStatistics1==null){
+ StatusModeStatisticsVO vo = new StatusModeStatisticsVO();
+ vo.setChargeMode(1);
+ vo.setFreeCount(0);
+ vo.setFilledCount(0);
+ vo.setInsertCount(0);
+ vo.setChargingCount(0);
+ statusModeStatistics1 =vo;
+ }
statusModeStatisticsVOS.add(statusModeStatistics1);
+ if (statusModeStatistics2==null){
+ StatusModeStatisticsVO vo = new StatusModeStatisticsVO();
+ vo.setChargeMode(2);
+ vo.setFreeCount(0);
+ vo.setFilledCount(0);
+ vo.setInsertCount(0);
+ vo.setChargingCount(0);
+ statusModeStatistics2 =vo;
+ }
statusModeStatisticsVOS.add(statusModeStatistics2);
+
+ if (statusModeStatistics3==null){
+ StatusModeStatisticsVO vo = new StatusModeStatisticsVO();
+ vo.setChargeMode(3);
+ vo.setFreeCount(0);
+ vo.setFilledCount(0);
+ vo.setInsertCount(0);
+ vo.setChargingCount(0);
+ statusModeStatistics3 =vo;
+ }
statusModeStatisticsVOS.add(statusModeStatistics3);
gunStatusStatisticsVO.setStatusModeStatistics(statusModeStatisticsVOS);
return gunStatusStatisticsVO;
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java
index 6ddc88c..c219fc5 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java
@@ -2,6 +2,8 @@
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.dto.SendMessageDTO;
+import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.chargingPile.api.feignClient.PartnerClient;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingPile;
@@ -63,6 +65,8 @@
@Resource
private SysUserRoleClient sysUserRoleClient;
+ @Resource
+ private AppUserClient appUserClient;
@Override
public void add(TFaultMessage dto) {
@@ -70,8 +74,14 @@
Site site = siteService.getById(dto.getSiteId());
TChargingPile chargingPile = chargingPileService.getById(dto.getChargingPileId());
String siteName = site.getName();
- String reqStr = MsgUtil.faultMsg(site.getPhone(), site.getName(), chargingPile.getNumber() + "");
- String result = HttpUtils.post(MsgConstants.SEND_URL, reqStr);
+// String reqStr = MsgUtil.faultMsg(site.getPhone(), site.getName(), chargingPile.getNumber() + "");
+// String result = HttpUtils.post(MsgConstants.SEND_URL, reqStr);
+ SendMessageDTO sendMessageDTO = new SendMessageDTO();
+ sendMessageDTO.setPhone(site.getPhone());
+ sendMessageDTO.setCode(site.getName());
+ sendMessageDTO.setChargeGun(chargingPile.getNumber() + "");
+ sendMessageDTO.setType(3);
+ String result = appUserClient.sendMessage(sendMessageDTO).getData();
log.info("故障短信提醒：{}",result);
if(siteName.length()>10){
siteName = siteName.substring(0,10);
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TRepairServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TRepairServiceImpl.java
index c1f07c9..173bacf 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TRepairServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TRepairServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.chargingPile.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.dto.SendMessageDTO;
+import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.chargingPile.api.feignClient.SiteClient;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingPile;
@@ -64,7 +66,9 @@
@Resource
private SysUserRoleClient sysUserRoleClient;
-
+ @Resource
+ private AppUserClient appUserClient;
+
@@ -108,8 +112,14 @@
Site site = siteService.getById(dto.getSiteId());
TChargingPile chargingPile = chargingPileService.getById(dto.getChargingPileId());
String siteName = site.getName();
- String reqStr = MsgUtil.faultMsg(site.getPhone(), site.getName(), chargingPile.getNumber() + "");
- String result = HttpUtils.post(MsgConstants.SEND_URL, reqStr);
+// String reqStr = MsgUtil.faultMsg(site.getPhone(), site.getName(), chargingPile.getNumber() + "");
+// String result = HttpUtils.post(MsgConstants.SEND_URL, reqStr);
+ SendMessageDTO sendMessageDTO = new SendMessageDTO();
+ sendMessageDTO.setPhone(site.getPhone());
+ sendMessageDTO.setCode(site.getName());
+ sendMessageDTO.setChargeGun(chargingPile.getNumber() + "");
+ sendMessageDTO.setType(3);
+ String result = appUserClient.sendMessage(sendMessageDTO).getData();
log.info("故障短信提醒：{}",result);
if(siteName.length()>10){
siteName = siteName.substring(0,10);
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/CouponController.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/CouponController.java
index 30b9ded..e123a3c 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/CouponController.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/CouponController.java
@@ -34,8 +34,9 @@
@ResponseBody
@PostMapping("/getCoupon")
public BaseResponse<GetCouponResp> getCoupon(GetCouponReq req){
- log.warn("停车获取优惠券请求参数：{}", JSON.toJSONString(req));
+ log.info("停车获取优惠券请求参数：{}", JSON.toJSONString(req));
GetCouponResp coupon = couponService.getCoupon(req);
+ log.info("停车获取优惠券结果：{}", JSON.toJSONString(coupon));
return BaseResponse.ok(coupon);
}
@@ -48,7 +49,7 @@
@ResponseBody
@PostMapping("/usedCoupon")
public BaseResponse usedCoupon(UsedCoupon req){
- log.warn("停车使用优惠券请求参数：{}", JSON.toJSONString(req));
+ log.info("停车使用优惠券请求参数：{}", JSON.toJSONString(req));
couponService.usedCoupon(req);
return BaseResponse.ok();
}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java
index 0979a75..1d5cd38 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java
@@ -28,7 +28,7 @@
@ResponseBody
@PostMapping("/cloudParkingInOrder")
public BaseResponse cloudParkingInOrder(@RequestBody CloudParkingOrder order){
- log.warn("云停车入场请求参数：{}", JSON.toJSONString(order));
+ log.info("云停车入场请求参数：{}", JSON.toJSONString(order));
parkingOrderService.cloudParkingInOrder(order);
return BaseResponse.ok();
}
@@ -41,7 +41,7 @@
@ResponseBody
@PostMapping("/cloudParkingOutOrder")
public BaseResponse cloudParkingOutOrder(@RequestBody CloudParkingOrder order){
- log.warn("云停车出场请求参数：{}", JSON.toJSONString(order));
+ log.info("云停车出场请求参数：{}", JSON.toJSONString(order));
parkingOrderService.cloudParkingOutOrder(order);
return BaseResponse.ok();
}
@@ -54,7 +54,7 @@
@ResponseBody
@PostMapping("/cloudParkingSpace")
public BaseResponse cloudParkingSpace(@RequestBody CloudParkingSpace parkingSpace){
- log.warn("云停车实时车位请求参数：{}", JSON.toJSONString(parkingSpace));
+ log.info("云停车实时车位请求参数：{}", JSON.toJSONString(parkingSpace));
parkingOrderService.cloudParkingSpace(parkingSpace);
return BaseResponse.ok();
}
@@ -67,7 +67,7 @@
@ResponseBody
@PostMapping("/offlineParkingInOrder")
public BaseResponse offlineParkingInOrder(@RequestBody OfflineParkingOrder order){
- log.warn("线下停车场入场请求参数：{}", JSON.toJSONString(order));
+ log.info("线下停车场入场请求参数：{}", JSON.toJSONString(order));
parkingOrderService.offlineParkingInOrder(order);
OfflineParkingResponse offlineParkingResponse = new OfflineParkingResponse();
offlineParkingResponse.setCode(0);
@@ -84,7 +84,7 @@
@ResponseBody
@PostMapping("/offlineParkingOutOrder")
public BaseResponse offlineParkingOutOrder(@RequestBody OfflineParkingOrder order){
- log.warn("线下停车场出场请求参数：{}", JSON.toJSONString(order));
+ log.info("线下停车场出场请求参数：{}", JSON.toJSONString(order));
parkingOrderService.offlineParkingOutOrder(order);
OfflineParkingResponse offlineParkingResponse = new OfflineParkingResponse();
offlineParkingResponse.setCode(0);
@@ -101,7 +101,7 @@
@ResponseBody
@PostMapping("/offlineParkingSpace")
public BaseResponse offlineParkingSpace(@RequestBody OfflineParkingSpace parkingSpace){
- log.warn("线下停车场实时车位请求参数：{}", JSON.toJSONString(parkingSpace));
+ log.info("线下停车场实时车位请求参数：{}", JSON.toJSONString(parkingSpace));
parkingOrderService.offlineParkingSpace(parkingSpace);
return BaseResponse.ok();
}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/CouponService.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/CouponService.java
index f028d1a..a99be6a 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/CouponService.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/CouponService.java
@@ -85,10 +85,6 @@
}else{
resp.setCouponName("充电停车时长优惠");
parameter.setTime(parkingLot.getChargeFreeDuration());
- data.setFreeDuration(parkingLot.getNonChargeFreeDuration());
- data.setChargingOrderId(tChargingOrder.getId());
- data.setAppUserId(tChargingOrder.getAppUserId());
- parkingRecordClient.updateParkingRecord(data);
}
resp.setParameter(parameter);
return resp;
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
index 6628553..613a09e 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
@@ -1,6 +1,8 @@
package com.ruoyi.integration.barrierGate.server;
import com.ruoyi.account.api.feignClient.AppUserCarClient;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.account.api.model.TAppUserCar;
import com.ruoyi.chargingPile.api.feignClient.ParkingLotClient;
import com.ruoyi.chargingPile.api.feignClient.ParkingRecordClient;
@@ -19,6 +21,7 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
+import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
@@ -41,6 +44,9 @@
@Resource
private ChargingOrderClient chargingOrderClient;
+
+ @Resource
+ private AppUserClient appUserClient;
@@ -79,6 +85,7 @@
query.setLicensePlate(order.getPlate());
query.setStatus(1);
TParkingRecord parkingRecord = parkingRecordClient.getParkingRecord(query).getData();
+ TParkingLot parkingLot = parkingLotClient.getParkingLotByAppKey(order.getAppkey()).getData();
LocalDateTime parse = LocalDateTime.parse(order.getLeaveDateTime(), DateTimeFormatter.ISO_DATE_TIME);
parse = parse.plusHours(8);
parkingRecord.setOutParkingTime(parse);
@@ -98,8 +105,25 @@
TChargingOrder chargingOrder = data.get(0);
parkingRecord.setAppUserId(chargingOrder.getAppUserId());
parkingRecord.setChargingOrderId(chargingOrder.getId());
+ TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
+ parkingRecord.setPhone(appUser.getPhone());
+ parkingRecord.setFreeDuration(parkingLot.getChargeFreeDuration());
+ //超时占位费
+ long out = parkingRecord.getOutParkingTime().atZone(ZoneId.systemDefault()).toEpochSecond();
+ long in = parkingRecord.getInParkingTime().atZone(ZoneId.systemDefault()).toEpochSecond();
+ long m = (out - in) / 60;
+ parkingRecord.setTimeoutAmount(m > parkingLot.getChargeFreeDuration() ? new BigDecimal(m - parkingLot.getChargeFreeDuration()).multiply(parkingLot.getChargeRate()) : BigDecimal.ZERO);
+
+ }else{
+ parkingRecord.setFreeDuration(parkingLot.getNonChargeFreeDuration());
+ //超时占位费
+ long out = parkingRecord.getOutParkingTime().atZone(ZoneId.systemDefault()).toEpochSecond();
+ long in = parkingRecord.getInParkingTime().atZone(ZoneId.systemDefault()).toEpochSecond();
+ long m = (out - in) / 60;
+ parkingRecord.setTimeoutAmount(m > parkingLot.getNonChargeFreeDuration() ? new BigDecimal(m - parkingLot.getNonChargeFreeDuration()).multiply(parkingLot.getChargeRate()) : BigDecimal.ZERO);
}
}
+ parkingRecord.setFreeAmount(parkingRecord.getOrderAmount().subtract(parkingRecord.getPayment()));
parkingRecordClient.updateParkingRecord(parkingRecord);
}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/SwitchwayGateService.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/SwitchwayGateService.java
index ab49ae7..4bd5357 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/SwitchwayGateService.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/SwitchwayGateService.java
@@ -36,7 +36,7 @@
JSONObject jsonObject = JSON.parseObject(result);
Boolean success = jsonObject.getBoolean("success");
if(!success){
- log.warn("调用开关道闸失败：\n请求参数：{}\n返回结果：{}", body, result);
+ log.info("调用开关道闸失败：\n请求参数：{}\n返回结果：{}", body, result);
}
return success;
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 99548af..bb06444 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -526,7 +526,7 @@
@ResponseBody
@PostMapping(value = "/securityDetection")
public void securityDetection(@RequestBody SecurityDetectionVO securityDetection){
- log.error("-------------------安全检测数据-------------------：" + securityDetection);
+ log.info("-------------------安全检测数据-------------------：" + securityDetection);
chargingOrderService.securityDetection(securityDetection);
}
@@ -537,7 +537,7 @@
@ResponseBody
@PostMapping(value = "/startChargeSuccessfully")
public void startChargeSuccessfully(@RequestBody PlatformStartChargingReplyMessageVO message){
- log.error("-------------------远程启动充电请求应答-------------------：" + message);
+ log.info("-------------------远程启动充电请求应答-------------------：" + message);
chargingOrderService.startChargeSuccessfully(message);
}
@@ -625,7 +625,7 @@
*/
@PostMapping("/terminateSuccessfulResponse")
public void terminateSuccessfulResponse(@RequestBody PlatformStopChargingReplyVO platformStopChargingReply){
- log.error("-------------------远程停止充电请求应答-------------------：" + platformStopChargingReply);
+ log.info("-------------------远程停止充电请求应答-------------------：" + platformStopChargingReply);
chargingOrderService.terminateSuccessfulResponse(platformStopChargingReply);
}
@@ -636,7 +636,7 @@
*/
@PostMapping("/endChargeBillingCharge")
public void endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo){
- log.error("-------------------停止充电返回账单后计算费用及修改业务状态-------------------：" + vo);
+ log.info("-------------------停止充电返回账单后计算费用及修改业务状态-------------------：" + vo);
chargingOrderService.endChargeBillingCharge(vo);
}
@@ -1280,11 +1280,13 @@
brands.add(objectMap.get("vehicle_brand").toString());
}
- Long count = chargingOrderService.countCar(brands);
- Map<String, Object> others = new HashMap<>();
- others.put("vehicle_brand","其他");
- others.put("counts",count);
- carBrandMap.add(others);
+ if (carBrandMap.size()>=5) {
+ Long count = chargingOrderService.countCar(brands);
+ Map<String, Object> others = new HashMap<>();
+ others.put("vehicle_brand", "其他");
+ others.put("counts", count);
+ carBrandMap.add(others);
+ }
//本地车数量
Map<String,Object> localCarMap = chargingOrderService.countLocalCar();
@@ -1804,7 +1806,7 @@
*/
@PostMapping("/endCharge")
public void endCharge(@RequestParam("code") String code){
- log.error(code + "：-------------------充电桩自动结束充电-------------------");
+ log.info(code + "：-------------------充电桩自动结束充电-------------------");
chargingOrderService.endCharge(code, 2);
}
@@ -1814,7 +1816,7 @@
*/
@PostMapping("/excelEndCharge")
public void excelEndCharge(@RequestParam("code") String code){
- log.error(code + "：-------------------充电异常，停止充电-------------------");
+ log.info(code + "：-------------------充电异常，停止充电-------------------");
chargingOrderService.excelEndCharge(code);
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index c31e65c..961a0a4 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -524,7 +524,7 @@
if(2 == addChargingOrder.getPaymentType()){
AliPaymentReq req = new AliPaymentReq();
req.setOutTradeNo(chargingOrder.getCode());
- req.setTotalAmount(chargingOrder.getPaymentAmount().toString());
+ req.setTotalAmount(addChargingOrder.getPaymentAmount().toString());
req.setSubject("充电充值");
req.setBuyerOpenId(appUser.getAliOpenid());
req.setBody("充电充值");
@@ -671,7 +671,7 @@
platformStartCharging.setCard_number(chargingOrder.getId().toString());
platformStartCharging.setAccount_balance(account_balance);
- log.error(chargingOrder.getCode() + "：-------------------远程调起开始充电请求-------------------" + platformStartCharging.toString());
+ log.info(chargingOrder.getCode() + "：-------------------远程调起开始充电请求-------------------" + platformStartCharging.toString());
sendMessageClient.platformStartCharging(platformStartCharging);
//异步线程检测远程启动的应答结果。如果失败，则需要全额退款
Long id = chargingOrder.getId();
@@ -699,7 +699,7 @@
String code = chargingOrder.getCode();
String key = "AQJC_" + chargingOrder.getChargingGunId();
List<PlatformStartChargingReply> data = platformStartChargingReplyClient.getPlatformStartChargingReply(code).getData();
- log.error(code + "：-------------------开始检查调起充电结果-------------------" + data.toString());
+ log.info(code + "：-------------------开始检查调起充电结果-------------------" + data.toString());
if(data.size() != 0){
PlatformStartChargingReply platformStartChargingReply = data.get(1);
Integer startup_result = platformStartChargingReply.getStartup_result();
@@ -741,7 +741,7 @@
return true;
}else{
Integer counter = boot_failed_map.get(code);
- log.error(code + "：-------------------未上传开启充电结果-------------------" + counter);
+ log.info(code + "：-------------------未上传开启充电结果-------------------" + counter);
PreChargeCheck preChargeCheck1 = redisService.getCacheObject(key);
//5分钟内未启动成功，退回金额。
if(null == counter || counter < 300){
@@ -837,7 +837,7 @@
* @param code
*/
public void refund(String code){
- log.error(code + "：-------------------充电启动失败，执行退款-------------------");
+ log.info(code + "：-------------------充电启动失败，执行退款-------------------");
TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, code));
if(chargingOrder.getStatus() == 2){
Integer rechargePaymentType = chargingOrder.getRechargePaymentType();
@@ -1007,8 +1007,8 @@
platformStopCharging.setCharging_pile_code(chargingPile.getCode());
platformStopCharging.setCharging_gun_code(chargingGun.getCode());
sendMessageClient.platformStopCharging(platformStopCharging);
- log.error(code1 + "：-------------------远程停止充电请求-------------------");
- log.error(platformStopCharging.toString());
+ log.info(code1 + "：-------------------远程停止充电请求-------------------");
+ log.info(platformStopCharging.toString());
});
return AjaxResult.success();
}
@@ -1163,7 +1163,7 @@
failure_cause = "其他";
break;
}
- log.error(code1 + "：停机失败：订单号：{}，失败原因：{}", order.getCode(), failure_cause);
+ log.info(code1 + "：停机失败：订单号：{}，失败原因：{}", order.getCode(), failure_cause);
}else{
TChargingOrder chargingOrder = new TChargingOrder();
chargingOrder.setId(order.getId());
@@ -1987,15 +1987,18 @@
}
}
}
+ //会员折扣金额
+ discountAmount = discountAmount.setScale(2, RoundingMode.DOWN);
payAmount = payAmount.subtract(discountAmount);
TChargingOrder order = new TChargingOrder();
order.setId(chargingOrder.getId());
order.setAppUserId(chargingOrder.getAppUserId());
- if(null != chargingOrder.getEndMode() && chargingOrder.getEndMode() == 2){
- order.setEndMode(refundAmount.compareTo(BigDecimal.ZERO) > 0 ? 2 : 3);
- }
- if(null == chargingOrder.getEndMode()){
+ UploadRealTimeMonitoringData uploadRealTimeMonitoringData = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
+ if(null != uploadRealTimeMonitoringData && null == chargingOrder.getEndMode()){
+ Integer soc = uploadRealTimeMonitoringData.getSoc();
+ order.setEndMode(soc > 98 ? 2 : 3);
+ }else{
order.setEndMode(1);
}
order.setResidualAmount(rechargeAmount.subtract(total).setScale(2, RoundingMode.DOWN));
@@ -2003,12 +2006,13 @@
order.setEndTime(LocalDateTime.parse(vo.getEnd_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS")));
order.setStatus(5);
order.setOrderAmount(orderAmount.setScale(2, RoundingMode.DOWN));
- order.setVipDiscountAmount(discountAmount.setScale(2, RoundingMode.DOWN));
+ order.setVipDiscountAmount(discountAmount);
order.setElectrovalence(periodElectricPrice_total.setScale(2, RoundingMode.DOWN));
order.setChargingCapacity(vo.getTotal_electricity());
order.setElectricity(vo.getTotal_electricity());
//计算优惠券
+ BigDecimal couponDiscount = BigDecimal.ZERO;
if(null != chargingOrder.getAppCouponId()){
//判断实际充电金额是否满足优惠券使用条件，如果不满足则不适用优惠券。
TAppCoupon appCoupon = appCouponClient.getAppCouponById(chargingOrder.getAppCouponId()).getData();
@@ -2021,17 +2025,12 @@
BigDecimal couponDiscountAmount = tCoupon.getDiscountAmount();
//如果优惠金额大于服务费金额，以服务费作为最大限制
if(periodServicePrice_total.compareTo(couponDiscountAmount) < 0){
- refundAmount = refundAmount.add(periodServicePrice_total);
- order.setCouponDiscountAmount(periodServicePrice_total);
- payAmount = payAmount.subtract(periodServicePrice_total);
+ couponDiscount = periodServicePrice_total;
periodServicePrice_total = BigDecimal.ZERO;
}else{
- refundAmount = refundAmount.add(couponDiscountAmount);
- order.setCouponDiscountAmount(couponDiscountAmount);
- payAmount = payAmount.subtract(couponDiscountAmount);
+ couponDiscount = couponDiscountAmount;
periodServicePrice_total = periodServicePrice_total.subtract(couponDiscountAmount);
}
-
appCoupon.setStatus(2);
appCouponClient.updateAppCoupon(appCoupon);
}else{
@@ -2048,14 +2047,10 @@
divide = divide.compareTo(tCoupon.getMaximumDiscountAmount()) > 0 ? tCoupon.getMaximumDiscountAmount() : divide;
//如果优惠金额大于服务费金额，以服务费作为最大限制
if(periodServicePrice_total.compareTo(divide) < 0){
- refundAmount = refundAmount.add(periodServicePrice_total);
- order.setCouponDiscountAmount(periodServicePrice_total);
- payAmount = payAmount.subtract(periodServicePrice_total);
+ couponDiscount = periodServicePrice_total;
periodServicePrice_total = BigDecimal.ZERO;
}else{
- refundAmount = refundAmount.add(divide);
- order.setCouponDiscountAmount(divide);
- payAmount = payAmount.subtract(divide);
+ couponDiscount = divide;
periodServicePrice_total = periodServicePrice_total.subtract(divide);
}
@@ -2068,7 +2063,11 @@
}
}
}
-
+ //优惠券优惠金额
+ couponDiscount = couponDiscount.setScale(2, RoundingMode.DOWN);
+ refundAmount = refundAmount.add(couponDiscount);
+ payAmount = payAmount.subtract(couponDiscount);
+ order.setCouponDiscountAmount(couponDiscount);
order.setServiceCharge(periodServicePrice_total.setScale(2, RoundingMode.DOWN));
order.setPaymentAmount(payAmount.setScale(2, RoundingMode.DOWN));
order.setRefundAmount(refundAmount.setScale(2, RoundingMode.DOWN));
@@ -2085,8 +2084,8 @@
BigDecimal periodServicePrice = chargingOrderAccountingStrategy.getPeriodServicePrice();
BigDecimal multiply = couponDiscountAmount.multiply(periodServicePrice.divide(reduce, new MathContext(4, RoundingMode.HALF_EVEN)));
periodServicePrice = periodServicePrice.subtract(multiply);
- chargingOrderAccountingStrategy.setPeriodServicePrice(periodServicePrice.setScale(2, RoundingMode.DOWN));
- chargingOrderAccountingStrategy.setCouponDiscountAmount(multiply.setScale(2, RoundingMode.DOWN));
+ chargingOrderAccountingStrategy.setPeriodServicePrice(periodServicePrice.setScale(2, RoundingMode.HALF_EVEN));
+ chargingOrderAccountingStrategy.setCouponDiscountAmount(multiply.setScale(2, RoundingMode.HALF_EVEN));
}
chargingOrderAccountingStrategyService.updateBatchById(list);
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
index dee224b..dab3ba5 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
@@ -352,42 +352,22 @@
//检测敏感词
String content = orderEvaluate.getContent();
if(StringUtils.isNotEmpty(content)){
- String token = appUserClient.getWXToken().getData();
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("content", content);
- jsonObject.put("version", 2);
- jsonObject.put("scene", 2);
- jsonObject.put("openid", appUser.getWxOpenid());
- String post = HttpUtils.post("https://api.weixin.qq.com/wxa/msg_sec_check?access_token=" + token, jsonObject.toString());
- JSONObject object = JSONObject.parseObject(post);
- Integer errcode = object.getInteger("errcode");
- if(0 != errcode){
- throw new RuntimeException(object.getString("errmsg"));
- }
- JSONArray detail = object.getJSONArray("detail");
- for (int i = 0; i < detail.size(); i++) {
- JSONObject jsonObject1 = detail.getJSONObject(i);
- Integer errcode1 = jsonObject1.getInteger("errcode");
- if(0 == errcode1){
- String suggest = jsonObject1.getString("suggest");
- Integer label = jsonObject1.getInteger("label");
- String keyword = jsonObject1.getString("keyword");
- Integer prob = jsonObject1.getInteger("prob");
- if(("risky".equals(suggest) || "review".equals(suggest)) && 100 != label && StringUtils.isNotEmpty(keyword) && 80 <= prob){
- return AjaxResult.error("评价包含违规内容，请重新评价!");
- }
- }
+ Boolean data = appUserClient.sensitiveWordDetection(content, appUser.getWxOpenid()).getData();
+ if(data){
+ return AjaxResult.error("评价包含违规内容，请重新评价!");
}
}
orderEvaluate.setContent(content);
this.save(orderEvaluate);
List<Integer> tagIds = query.getTagIds();
- for (Integer tagId : tagIds) {
- TOrderEvaluateTag orderEvaluateTag = new TOrderEvaluateTag();
- orderEvaluateTag.setOrderEvaluateId(orderEvaluate.getId());
- orderEvaluateTag.setEvaluationTagId(tagId);
- orderEvaluateTagMapper.insert(orderEvaluateTag);
+ if(null != tagIds){
+ for (Integer tagId : tagIds) {
+ TOrderEvaluateTag orderEvaluateTag = new TOrderEvaluateTag();
+ orderEvaluateTag.setOrderEvaluateId(orderEvaluate.getId());
+ orderEvaluateTag.setEvaluationTagId(tagId);
+ orderEvaluateTagMapper.insert(orderEvaluateTag);
+ }
}
//判断发放积分 文字+图片+5星好评
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
index 6cd271a..16a0f3b 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
@@ -146,7 +146,8 @@
orderInvoiceDetail.setAddedServiceTariff(invoiceType.getAddedServiceTariff());
orderInvoiceDetail.setElectrovalence(electrovalence);
orderInvoiceDetail.setServiceCharge(serviceCharge);
- orderInvoiceDetail.setAddedService(serviceCharge.multiply(invoiceType.getAddedServiceTariff().divide(new BigDecimal(100))));
+ orderInvoiceDetail.setAddedService(serviceCharge.multiply(null == invoiceType.getAddedServiceTariff()
+ ? new BigDecimal(1) : invoiceType.getAddedServiceTariff().divide(new BigDecimal(100))));
orderInvoiceDetailService.save(orderInvoiceDetail);
}
return AjaxResult.success();
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
index ed930b2..bda3e7a 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -1549,9 +1549,13 @@
select count(1)
from
charging_pile_account.t_app_user_car
- where del_flag = 0 and vehicle_brand not in
+ where del_flag = 0
+
+ <if test="brands != null and brands.size() > 0">
+ and vehicle_brand not in
<foreach collection="brands" item="brand" open="(" separator="," close=")">
#{brand}
</foreach>
+ </if>
</select>
</mapper>
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
index c003b2e..330b67d 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
@@ -30,7 +30,10 @@
import com.ruoyi.other.service.TActivityService;
import com.ruoyi.other.service.TCouponService;
import com.ruoyi.other.service.TGoodsService;
+import com.ruoyi.payment.api.feignClient.AliPaymentClient;
import com.ruoyi.payment.api.feignClient.WxPaymentClient;
+import com.ruoyi.payment.api.vo.AliPaymentReq;
+import com.ruoyi.payment.api.vo.AliPaymentResp;
import com.ruoyi.payment.api.vo.PaymentOrder;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -282,9 +285,12 @@
}
+ @Resource
+ private AliPaymentClient aliPaymentClient;
+
@ApiOperation(tags = {"小程序-现金商城"},value = "支付商品")
@PostMapping(value = "/app/pay")
- public R<Map<String, Object>> pay(@RequestBody ExchangeDto exchangeDto) {
+ public Object pay(@RequestBody ExchangeDto exchangeDto) {
Long userId = tokenService.getLoginUserApplet().getUserId();
TAppUser user = appUserClient.getUserById(userId).getData();
boolean isVip = false;
@@ -361,13 +367,19 @@
mapR.getData().put("orderId",shopOrder.getId().toString());
return mapR;
}else {
- //todo 罗 支付宝支付
- return R.ok();
+ AliPaymentReq req = new AliPaymentReq();
+ req.setOutTradeNo(shopOrder.getCode());
+ req.setTotalAmount(shopOrder.getPaymentAmount().toString());
+ req.setSubject("购买商品");
+ req.setBuyerOpenId(user.getAliOpenid());
+ req.setBody("购买商品");
+ AliPaymentResp data = aliPaymentClient.payment(req).getData();
+ if(null != data){
+ data.setNotifyUrl(data.getNotifyUrl() + "/payment/callBack/ali/all");
+ return AjaxResult.success(data);
+ }
}
-
-
-
-
+ return AjaxResult.success();
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
index 8ebbd2f..48e5837 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
@@ -322,7 +322,7 @@
@ApiOperation(value = "购买会员", tags = {"小程序-个人中心"})
@GetMapping("/vipInfo/pay")
- public R vipInfoPay(@RequestParam("vipId")Integer vipId,@RequestParam("buyType") Integer buyType,
+ public Object vipInfoPay(@RequestParam("vipId")Integer vipId,@RequestParam("buyType") Integer buyType,
@RequestParam("payType") Integer payType
) {
@@ -366,7 +366,7 @@
Long userId = tokenService.getLoginUserApplet().getUserId();
- return R.ok(vipService.vipInfoPay(byId,payMoney,payType,discountMoney,discount,buyType,userId));
+ return vipService.vipInfoPay(byId,payMoney,payType,discountMoney,discount,buyType,userId);
}
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TVipService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TVipService.java
index 522dd5a..7908f43 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TVipService.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TVipService.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TVip;
@@ -19,5 +20,5 @@
PageInfo<TVip> pageList(Integer pageCurr,Integer pageSize);
- Object vipInfoPay(TVip byId, BigDecimal payMoney, Integer payType,BigDecimal discountMoney,BigDecimal discount,Integer buyType, Long userId);
+ Object vipInfoPay(TVip byId, BigDecimal payMoney, Integer payType, BigDecimal discountMoney, BigDecimal discount, Integer buyType, Long userId);
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java
index 0bad395..b1d5fe1 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java
@@ -124,7 +124,7 @@
paymentOrder.setAmount(shopOrder.getPaymentAmount());
paymentOrder.setOpenId(user.getWxOpenid());
paymentOrder.setDescription("购买会员");
- return wxPaymentClient.orderPay(paymentOrder).getData();
+ return AjaxResult.success(wxPaymentClient.orderPay(paymentOrder).getData());
}else {
AliPaymentReq req = new AliPaymentReq();
req.setOutTradeNo(shopOrder.getCode());
@@ -134,7 +134,7 @@
req.setBody("充电充值");
AliPaymentResp data = aliPaymentClient.payment(req).getData();
if(null != data){
- data.setNotifyUrl(data.getNotifyUrl() + "/callBack/ali/all");
+ data.setNotifyUrl(data.getNotifyUrl() + "/payment/callBack/ali/all");
return AjaxResult.success(data);
}
}
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java
index 171369c..8816fac 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java
@@ -2,6 +2,8 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.order.api.feignClient.ChargingOrderClient;
+import com.ruoyi.order.api.feignClient.OrderClient;
import com.ruoyi.payment.ali.config.AliProperties;
import com.ruoyi.payment.ali.v2.AppletPayUtil;
import com.ruoyi.payment.api.model.*;
@@ -88,20 +90,33 @@
}
+ @Resource
+ private OrderClient orderClient;
+ @Resource
+ private ChargingOrderClient chargingOrderClient;
@ResponseBody
- @PostMapping(value = "/allCallBack")
+ @PostMapping(value = "/all")
public void chargingOrderALICallback(@RequestBody AliQueryOrder aliQueryOrder, HttpServletResponse response) {
try {
String out_trade_no = aliQueryOrder.getOutTradeNo();
String transaction_id = aliQueryOrder.getTradeNo();
String attach = aliQueryOrder.getPassbackParams();
-// AjaxResult ajaxResult = chargingOrderService.chargingOrderCallback(2, out_trade_no, transaction_id, attach);
-// if (ajaxResult.isSuccess()) {
-// PrintWriter writer = response.getWriter();
-// writer.println("success");
-// writer.flush();
-// writer.close();
-// }
+ String substring = out_trade_no.substring(0, 2);
+ switch (substring){
+ //购物订单
+ case "GW":
+ R r = orderClient.callBack(out_trade_no, transaction_id);
+ System.err.println("----收到购物回调");
+ break;
+ case "HY":
+ orderClient.vipCallBack(out_trade_no,transaction_id);
+ System.err.println("----收到会员回调");
+ break;
+ case "CD":
+ chargingOrderClient.chargingOrderWXCallback(out_trade_no, transaction_id, attach);
+ System.err.println("----充电支付回调");
+ break;
+ }
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.7.1