From d40062a54801e55d4bbed2a9836342fe9578b147 Mon Sep 17 00:00:00 2001
From: wangshuai <daws172839@163.com>
Date: Wed, 17 Jul 2024 18:52:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=89=88=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BusStoreInfoController.java         | 14 +++++++++-----
 .../controller/BusTemplateInfoController.java      | 10 ++++++++++
 ruoyi-ui/src/views/statistics/shop/index.vue       |  4 ++--
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java
index 11c1f32..aecbc3f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java
@@ -196,8 +196,8 @@ public class BusStoreInfoController extends BaseController {
         List<BusStoreDayInfo> ll = busStoreDayInfoService.selectBusStoreDayInfoList(busStoreDayInfo);
         BusStoreDayInfo busStoreDayInfo1 = ll.get(0);
         String content = busTemplateInfo.getTemplateContent();
-        for(BusTemplateAttrInfo busTemplateAttrInfo:busTemplateInfo.getAttrInfoList()){
-            if(content.contains(busTemplateAttrInfo.getAttrValue())){
+//        for(BusTemplateAttrInfo busTemplateAttrInfo:busTemplateInfo.getAttrInfoList()){
+//            if(content.contains(busTemplateAttrInfo.getAttrValue())){
                 content = content.replaceAll("#name",busStoreInfo.getStoreName());
                 content = content.replaceAll("#from", "1".equals(busStoreInfo.getPlatformType())?"美团":"饿了么");
                 content = content.replaceAll("#date", LocalDate.now().minusDays(1).toString());
@@ -207,13 +207,17 @@ public class BusStoreInfoController extends BaseController {
                 content = content.replaceAll("#score",busStoreDayInfo1.getScore());
                 int a = busStoreDayInfo1.getLastPositiveReviewsNum();//todo 好评-五星
                 int b = busStoreDayInfo1.getLastReturnVisitNum();
-                content = content.replaceAll("#rate", getRate(a,b));
+                if (a != 0 && b != 0) {
+                    content = content.replaceAll("#rate", getRate(a,b)+"%");
+                } else {
+                    content = content.replaceAll("#rate", "0%");
+                }
                 if(content.contains("#fee")&&busStoreInfo.getPrice() == null){
                     throw new ServiceException("请设置单价!");
                 }
                 content = content.replaceAll("#fee",busStoreInfo.getPrice().multiply(new BigDecimal(busStoreDayInfo1.getLastFiveStarReviewsNum()))+"");
-            }
-        }
+//            }
+//        }
         content = content.replaceAll("(</p><p>)\\s*", "\n");
         content = content.replaceAll("(<p>)|(</p>)", "");
         // 对于连续多个换行符的情况，保留一个换行符
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusTemplateInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusTemplateInfoController.java
index 6492a32..c0899d6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusTemplateInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusTemplateInfoController.java
@@ -3,6 +3,7 @@ package com.ruoyi.business.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.utils.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -46,6 +47,9 @@ public class BusTemplateInfoController extends BaseController
     public TableDataInfo list(BusTemplateInfo busTemplateInfo)
     {
         startPage();
+        if(!"admin".equals(SecurityUtils.getUsername())){
+            busTemplateInfo.setCreateId(SecurityUtils.getUserId());
+        }
         List<BusTemplateInfo> list = busTemplateInfoService.selectBusTemplateInfoList(busTemplateInfo);
         return getDataTable(list);
     }
@@ -88,6 +92,10 @@ public class BusTemplateInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody BusTemplateInfo busTemplateInfo)
     {
+        busTemplateInfo.setCreateId(SecurityUtils.getUserId());
+        busTemplateInfo.setCreateUser(SecurityUtils.getUsername());
+        busTemplateInfo.setTemplateType("word");
+        busTemplateInfo.setTemplateStatus("1");
         return toAjax(busTemplateInfoService.insertBusTemplateInfo(busTemplateInfo));
     }
 
@@ -99,6 +107,8 @@ public class BusTemplateInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody BusTemplateInfo busTemplateInfo)
     {
+        busTemplateInfo.setUpdateId(SecurityUtils.getUserId());
+        busTemplateInfo.setUpdateUser(SecurityUtils.getUsername());
         return toAjax(busTemplateInfoService.updateBusTemplateInfo(busTemplateInfo));
     }
 
diff --git a/ruoyi-ui/src/views/statistics/shop/index.vue b/ruoyi-ui/src/views/statistics/shop/index.vue
index d747979..9f64686 100644
--- a/ruoyi-ui/src/views/statistics/shop/index.vue
+++ b/ruoyi-ui/src/views/statistics/shop/index.vue
@@ -166,8 +166,8 @@
           <dict-tag :options="dict.type.sys_platform_type" :value="scope.row.platformType"/>
         </template>
       </el-table-column>
-      <el-table-column label="编号" prop="storeCode" :show-overflow-tooltip="true"  width="55" align="center" />
-      <el-table-column label="名称" prop="storeName" :show-overflow-tooltip="true"  align="center" />
+      <el-table-column label="编号" prop="storeCode"  align="center" />
+      <el-table-column label="名称" prop="storeName" align="center" />
       <el-table-column label="在线状态" prop ="grantStatus" align="center"  width="75" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_grant_status" :value="scope.row.grantStatus"/>