From 3e7dddeb724891fc57dec4bd778cdb84d59523e5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 04 十一月 2024 18:50:52 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java |   12 +++++++-----
 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/config/FileUploadConfig.java  |   21 +++++++++++++++++++++
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/config/FileUploadConfig.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/config/FileUploadConfig.java
new file mode 100644
index 0000000..5d9cd57
--- /dev/null
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/config/FileUploadConfig.java
@@ -0,0 +1,21 @@
+package com.ruoyi.chargingPile.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-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 c726775..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
@@ -361,11 +361,13 @@
         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();

--
Gitblit v1.7.1