From f7f3c4c52cdc35ae17186433767f61933c6fa563 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 01 十一月 2024 09:15:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/CodeController.java | 4 +-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderEvaluateService.java | 2
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 4 +-
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileNotificationMapper.java | 12 ++++++
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml | 2
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java | 12 +++++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 5 ++
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml | 18 ++++++++-
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml | 5 +-
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java | 4 +-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java | 4 +-
11 files changed, 56 insertions(+), 16 deletions(-)
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 8a7e076..3a24689 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
@@ -51,7 +51,7 @@
String reqStr = MsgUtil.codeMsg(phone, code);
String result = HttpUtils.post(MsgConstants.SEND_URL, reqStr);
// 记录短信发送
- chargingPileNotificationService.saveData(1,null,null,phone,"验证码："+code+"，用于更换手机号。请勿转发。");
+ chargingPileNotificationService.saveData(1,-1,-1,phone,"验证码："+code+"，用于更换手机号。请勿转发。");
return AjaxResult.success(result);
}
@@ -70,7 +70,7 @@
String reqStr = MsgUtil.applyCodeMsg(phone, code);
String result = HttpUtils.post(MsgConstants.SEND_URL, reqStr);
// 记录短信发送
- chargingPileNotificationService.saveData(1,null,null,phone,"验证码："+code+"，用于申请建桩。请勿转发。");
+ 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/TAccountingStrategyController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
index 15341dd..5661ba5 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
@@ -191,7 +191,10 @@
dto.setAuditStatus(1);
accountingStrategyService.updateById(dto);
// 添加明细
- dto.getAccountingStrategyDetails().forEach(detail -> detail.setAccountingStrategyId(dto.getId()));
+ dto.getAccountingStrategyDetails().forEach(detail -> {
+ detail.setAccountingStrategyId(dto.getId());
+ detail.setId(null);
+ });
accountingStrategyDetailService.saveBatch(dto.getAccountingStrategyDetails());
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileNotificationMapper.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileNotificationMapper.java
index d093e4c..abc3c3d 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileNotificationMapper.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileNotificationMapper.java
@@ -27,4 +27,16 @@
*/
List<TChargingPileNotification> chargingPileNotificationPageList(PageInfo<TChargingPileNotification> pageInfo, @Param("siteIds") Set<Integer> siteIds);
+ /**
+ * 保存通知数据
+ * @param siteId
+ * @param chargingPileId
+ * @param phone
+ * @param content
+ */
+ void saveData(@Param("siteId") Integer siteId,
+ @Param("chargingPileId")Integer chargingPileId,
+ @Param("phone")String phone,
+ @Param("content")String content);
+
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java
index c9e5bc9..67f62d0 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java
@@ -95,8 +95,8 @@
@Override
public void saveData(Integer type,Integer siteId,Integer chargingPileId, String phone, String data) {
TChargingPileNotification notification = new TChargingPileNotification();
- notification.setSiteId(siteId==null?-1:siteId);
- notification.setChargingPileId(chargingPileId==null?-1:chargingPileId);
+ notification.setSiteId(siteId);
+ notification.setChargingPileId(chargingPileId);
notification.setPhone(phone);
notification.setContent(data);
this.save(notification);
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml
index 6a5ef5e..2b4d866 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml
@@ -87,7 +87,7 @@
select
a.id,
a.status,
- CONCAT(b.number, a.name) as name,
+ CONCAT(b.name, a.name) as name,
a.parking_number as parkingNumber
from t_charging_gun a
left join t_charging_pile b on (a.charging_pile_id = b.id)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml
index e35a362..2901664 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml
@@ -17,9 +17,23 @@
<sql id="Base_Column_List">
id, site_id, charging_pile_id, content, create_time, del_flag
</sql>
+ <insert id="saveData">
+ insert into t_charging_pile_notification(
+ <if test="siteId != null and siteId != 0">site_id,</if>
+ <if test="chargingPileId != null and chargingPileId != 0">charging_pile_id,</if>
+ <if test="phone != null and phone != ''">phone,</if>
+ <if test="content != null and content != ''">content,</if>
+ create_time
+ )values(
+ <if test="siteId != null and siteId != 0">#{siteId},</if>
+ <if test="chargingPileId != null and chargingPileId != 0">#{chargingPileId},</if>
+ <if test="phone != null and phone != ''">#{phone},</if>
+ <if test="content != null and content != ''">#{content},</if>
+ sysdate()
+ )
+ </insert>
-
-
+
<select id="chargingPileNotificationPageList" resultType="com.ruoyi.chargingPile.api.model.TChargingPileNotification">
select
a.id,
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java
index 00bbda4..1db4d3a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java
@@ -48,8 +48,8 @@
@ApiOperation(tags = {"小程序-订单评价"},value = "充电订单评价标签及数量查询")
@GetMapping(value = "/getTagCount")
- public AjaxResult<List<TEvaluationTagVO>> getTagCount() {
- return AjaxResult.ok(orderEvaluateService.getTagCount());
+ public AjaxResult<List<TEvaluationTagVO>> getTagCount(@RequestParam(value = "siteId")@ApiParam(value = "站点id")Integer siteId) {
+ return AjaxResult.ok(orderEvaluateService.getTagCount(siteId));
}
@ApiOperation(tags = {"小程序-订单评价"},value = "充电订单评价分页列表查询")
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderEvaluateService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderEvaluateService.java
index 8444a5b..e95295d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderEvaluateService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderEvaluateService.java
@@ -31,7 +31,7 @@
* 获取评价标签
* @return
*/
- List<TEvaluationTagVO> getTagCount();
+ List<TEvaluationTagVO> getTagCount(Integer siteId);
/**
* 充电订单评价分页列表查询
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 7619236..33bd961 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
@@ -1103,7 +1103,7 @@
String code = Double.valueOf(Math.random() * 1000).intValue() + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
appUserIntegralChange.setCode(code);
appUserIntegralChange.setAppUserId(appUser1.getId());
- appUserIntegralChange.setChangeType(5);
+ appUserIntegralChange.setChangeType(4);
appUserIntegralChange.setHistoricalIntegral(appUser1.getPoints());
appUserIntegralChange.setCurrentIntegral(appUser1.getPoints() + num1);
appUserIntegralChange.setCreateTime(LocalDateTime.now());
@@ -2029,7 +2029,7 @@
}
}
- order.setServiceCharge(periodServicePrice_total);
+ order.setServiceCharge(periodServicePrice_total.setScale(2, RoundingMode.DOWN));
order.setPaymentAmount(payAmount);
order.setRefundAmount(refundAmount);
order.setRefundStatus(1);
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 c9c9f8a..dee224b 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
@@ -131,10 +131,20 @@
@Resource
private TOrderEvaluateMapper orderEvaluateMapper;
@Override
- public List<TEvaluationTagVO> getTagCount() {
+ public List<TEvaluationTagVO> getTagCount(Integer siteId) {
// 查询标签列表
R<List<TEvaluationTagVO>> r = evaluationTagClient.getList();
List<TEvaluationTagVO> tagList = r.getData();
+ // 查询站点下的所有订单
+ List<TChargingOrder> tChargingOrders = chargingOrderMapper.selectList(Wrappers.lambdaQuery(TChargingOrder.class)
+ .eq(TChargingOrder::getSiteId, siteId));
+ if(CollectionUtils.isEmpty(tChargingOrders)){
+ tagList.forEach(e->e.setTagCount(0));
+ packageTagCount(0L,"有图",2,tagList);
+ packageTagCount(0L,"好评",3,tagList);
+ packageTagCount(0L,"中差评",4,tagList);
+ return tagList;
+ }
List<Integer> tagIds = tagList.stream().map(TEvaluationTagVO::getId).collect(Collectors.toList());
// 统计标签使用数量
List<TEvaluationTagVO> counts = orderEvaluateTagMapper.getCountByTagIds(tagIds);
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml
index 75427e3..872f114 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml
@@ -84,8 +84,9 @@
select id, order_type, order_id, app_user_id,app_user_car_id, mark, content, img_url, evaluation_response,
create_time, response_time, del_flag
from t_order_evaluate
- where order_id in
- (select order_id
+ where del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
+ and order_id in
+ (select id
from t_charging_order
where site_id = #{siteId}
and del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()})
--
Gitblit v1.7.1