From 9fae029e460a7ba07f057d8ecbebc13bdd3c6ac7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 15 十月 2024 18:30:08 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 101 +++++++++++++++++++++++----------
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java | 48 ++++++++-------
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 2
3 files changed, 95 insertions(+), 56 deletions(-)
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 780c63f..604b1e2 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
@@ -434,6 +434,7 @@
chargingOrder.setAppUserId(userId);
chargingOrder.setAppUserCarId(addChargingOrder.getAppUserCarId());
TChargingGun tChargingGun = chargingGunClient.getChargingGunById(addChargingOrder.getId()).getData();
+ TChargingPile chargingPile = chargingPileClient.getChargingPileById(tChargingGun.getChargingPileId()).getData();
chargingOrder.setSiteId(tChargingGun.getSiteId());
chargingOrder.setChargingPileId(tChargingGun.getChargingPileId());
chargingOrder.setChargingGunId(addChargingOrder.getId());
@@ -443,6 +444,8 @@
chargingOrder.setAppCouponId(addChargingOrder.getAppUserCouponId());
chargingOrder.setVipDiscount(new BigDecimal(10));
chargingOrder.setVipDiscountAmount(BigDecimal.ZERO);
+ chargingOrder.setOrderSource(0);
+ chargingOrder.setTitle("【充电桩充电】" + chargingPile.getNumber() + "号桩/" + tChargingGun.getCode() + "号枪");
Site site = siteClient.getSiteByIds(Arrays.asList(tChargingGun.getSiteId())).getData().get(0);
Integer accountingStrategyId = tChargingGun.getAccountingStrategyId();
@@ -965,7 +968,6 @@
return AjaxResult.error("不能重复操作");
}
chargingOrder.setEndTime(LocalDateTime.now());
- chargingOrder.setStatus(4);
chargingOrder.setEndMode(1);
this.updateById(chargingOrder);
@@ -987,6 +989,7 @@
for (int i = 0; i < 60; i++) {
TChargingOrder chargingOrder1 = this.getById(id);
if(chargingOrder1.getStatus() != 3){
+ stop_status = true;
break;
}
GetPlatformStopChargingReply query = new GetPlatformStopChargingReply();
@@ -1035,16 +1038,8 @@
}
}
if(stop_status){
- chargingOrder.setStatus(5);
+ chargingOrder.setEndMode(1);
this.updateById(chargingOrder);
-
- //计算用户标签
- editUserTag(chargingOrder);
- //用户推荐奖励
- referralReward(chargingOrder);
- // 将枪状态重置为空闲
- chargingGun.setStatus(2);
- chargingGunClient.updateChargingGunById(chargingGun);
}else{
log.error(code1 + "：-------------------远程停止充电应答最终失败-------------------");
}
@@ -1210,8 +1205,11 @@
}
log.error(code1 + "：停机失败：订单号：{}，失败原因：{}", order.getCode(), failure_cause);
}else{
- order.setEndMode(1);
- this.updateById(order);
+ TChargingOrder chargingOrder = new TChargingOrder();
+ chargingOrder.setId(order.getId());
+ chargingOrder.setAppUserId(order.getAppUserId());
+ chargingOrder.setEndMode(1);
+ this.updateById(chargingOrder);
}
}
@@ -1792,8 +1790,16 @@
}
BigDecimal residualAmount = chargingOrder.getRechargeAmount().subtract(t).setScale(4, RoundingMode.HALF_EVEN);
chargingOrder.setResidualAmount(residualAmount);
- BigDecimal divide = query.getOutput_current().multiply(query.getOutput_voltage()).divide(new BigDecimal(1000));
- chargingOrder.setChargingPower(divide);
+ if(query.getOutput_current().compareTo(BigDecimal.ZERO) != 0){
+ BigDecimal divide = query.getOutput_current().multiply(query.getOutput_voltage()).divide(new BigDecimal(1000));
+ chargingOrder.setChargingPower(divide);
+ chargingOrder.setCurrent(query.getOutput_current());
+ chargingOrder.setVoltage(query.getOutput_voltage());
+ chargingOrder.setPower(query.getOutput_current().multiply(query.getOutput_voltage()));
+ chargingOrder.setNeedElec(query.getOutput_current());
+ }
+ chargingOrder.setElectricity(query.getCharging_degree());
+ chargingOrder.setTotalElectricity(new BigDecimal(100 - query.getSoc()));
this.updateById(chargingOrder);
}
}
@@ -1806,7 +1812,10 @@
@Override
@GlobalTransactional(rollbackFor = Exception.class)
public void endCharge(String orderCode, Integer endMode) {
- TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, orderCode));
+ TChargingOrder order = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, orderCode));
+ TChargingOrder chargingOrder = new TChargingOrder();
+ chargingOrder.setId(order.getId());
+ chargingOrder.setAppUserId(order.getAppUserId());
chargingOrder.setEndMode(endMode);
this.updateById(chargingOrder);
}
@@ -1832,6 +1841,25 @@
Integer status = chargingOrder.getStatus();
if(status == 4 || status == 5){
return;
+ }
+
+ //先判断总的充电度数是否和总报文消息中的数据相同，不相同等待30s
+ UploadRealTimeMonitoringData uploadRealTimeMonitoringData = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
+ if(null != uploadRealTimeMonitoringData){
+ for (int i = 0; i < 30; i++) {
+ List<TChargingOrderAccountingStrategy> list1 = chargingOrderAccountingStrategyService.list(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId()));
+ BigDecimal reduce = list1.stream().map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal charging_degree = uploadRealTimeMonitoringData.getCharging_degree();
+ if(charging_degree.compareTo(reduce) != 0){
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }else{
+ break;
+ }
+ }
}
//计算用户标签
@@ -1890,15 +1918,21 @@
payAmount = payAmount.subtract(discountAmount);
}
- if(chargingOrder.getEndMode() == 2){
- chargingOrder.setEndMode(refundAmount.compareTo(BigDecimal.ZERO) > 0 ? 2 : 3);
+ 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);
}
- chargingOrder.setEndTime(LocalDateTime.now());
- chargingOrder.setStatus(5);
- chargingOrder.setOrderAmount(orderAmount);
- chargingOrder.setVipDiscountAmount(discountAmount);
- chargingOrder.setServiceCharge(periodServicePrice_total);
- chargingOrder.setElectrovalence(periodElectricPrice_total);
+ if(null == chargingOrder.getEndMode()){
+ order.setEndMode(1);
+ }
+ order.setEndTime(LocalDateTime.now());
+ order.setStatus(5);
+ order.setOrderAmount(orderAmount);
+ order.setVipDiscountAmount(discountAmount);
+ order.setServiceCharge(periodServicePrice_total);
+ order.setElectrovalence(periodElectricPrice_total);
//计算优惠券
if(null != chargingOrder.getAppCouponId()){
@@ -1911,11 +1945,11 @@
//满减
if(payAmount.compareTo(tCoupon.getMeetTheConditions()) >= 0){
refundAmount = refundAmount.add(tCoupon.getDiscountAmount());
- chargingOrder.setCouponDiscountAmount(tCoupon.getDiscountAmount());
+ order.setCouponDiscountAmount(tCoupon.getDiscountAmount());
payAmount = payAmount.subtract(tCoupon.getDiscountAmount());
}else{
- chargingOrder.setAppCouponId(null);
- chargingOrder.setCouponDiscountAmount(BigDecimal.ZERO);
+ order.setAppCouponId(null);
+ order.setCouponDiscountAmount(BigDecimal.ZERO);
appCouponClient.refund(chargingOrder.getAppCouponId().toString());
}
}
@@ -1926,17 +1960,20 @@
BigDecimal divide = payAmount.multiply(new BigDecimal(10).subtract(tCoupon.getDiscount())).divide(new BigDecimal(10));
divide = divide.compareTo(tCoupon.getMaximumDiscountAmount()) > 0 ? tCoupon.getMaximumDiscountAmount() : divide;
refundAmount = refundAmount.add(divide);
- chargingOrder.setCouponDiscountAmount(divide);
+ order.setCouponDiscountAmount(divide);
payAmount = payAmount.subtract(divide);
}else{
- chargingOrder.setAppCouponId(null);
- chargingOrder.setCouponDiscountAmount(BigDecimal.ZERO);
+ order.setAppCouponId(null);
+ order.setCouponDiscountAmount(BigDecimal.ZERO);
appCouponClient.refund(chargingOrder.getAppCouponId().toString());
}
}
}
- chargingOrder.setPaymentAmount(payAmount);
- this.updateById(chargingOrder);
+ order.setPaymentAmount(payAmount);
+ order.setRefundAmount(refundAmount);
+ order.setRefundStatus(1);
+ this.updateById(order);
+ chargingOrder = this.getById(order.getId());
// 将枪状态重置为空闲
TChargingGun chargingGun = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
@@ -2010,7 +2047,7 @@
RefundReq dto = new RefundReq();
dto.setOutTradeNo(chargingOrder.getCode());
dto.setOutRequestNo(chargingOrderRefund.getCode());
- dto.setRefundAmount(rechargeAmount.toString());
+ dto.setRefundAmount(refundAmount.toString());
dto.setRefundReason("充电完成退款");
RefundResp resp = aliPaymentClient.refund(dto).getData();
if(null != resp){
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 6823260..7a36dd9 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
@@ -274,29 +274,31 @@
//检测敏感词
String content = orderEvaluate.getContent();
- 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){
- content = content.replaceAll(keyword, "***");
+ 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){
+ content = content.replaceAll(keyword, "***");
+ }
}
}
}
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 74ee227..2e982a7 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
@@ -62,7 +62,7 @@
</if>
</select>
<select id="getNoInvoicedOrder" resultMap="BaseResultMap">
- select * from t_charging_order where del_flag = 0 and status = 5 and recharge_payment_status = 2 and payment_amount is null and app_user_id = #{appUserId}
+ select * from t_charging_order where del_flag = 0 and status = 5 and recharge_payment_status = 2 and payment_amount is not null and app_user_id = #{appUserId}
<if test="null != month and '' != month">
and DATE_FORMAT(end_time, '%Y-%m') = #{month}
</if>
--
Gitblit v1.7.1