From 0cbccb8c2d97685c8912ff6c6c8e8478ef9e9c6a Mon Sep 17 00:00:00 2001 From: wangshuai Date: Fri, 19 Jul 2024 14:18:17 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9B=E6=A8=A1=E7=89=88=E5=86=85=E5=AE=B9?= =?UTF-8?q?=202=EF=BC=9B=E5=8D=95=E4=B8=AA=E5=BA=97=E9=93=BA=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=8C=89=E9=92=AE=203=EF=BC=9B=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=20=E6=8B=BC=E5=A5=BD=E9=A5=AD=20=E9=99=90?= =?UTF-8?q?=E9=A2=9D=E9=BB=98=E8=AE=A4=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusStoreInfoController.java | 1 + .../controller/BusTemplateInfoController.java | 13 ++++++++++++ .../business/domain/BusTemplateInfo.java | 10 --------- .../impl/BusTemplateInfoServiceImpl.java | 5 ----- .../service/impl/MeituanServiceImpl.java | 3 +++ ruoyi-ui/src/api/statistics/template.js | 7 +++++++ ruoyi-ui/src/views/market/whole/index.vue | 5 +++-- ruoyi-ui/src/views/statistics/daily/index.vue | 21 ++++++++++++++----- 8 files changed, 43 insertions(+), 22 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 c877a2a..ad383f7 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 @@ -205,6 +205,7 @@ public class BusStoreInfoController extends BaseController { content = content.replaceAll("#good",busStoreDayInfo1.getLastPositiveReviewsNum()+""); content = content.replaceAll("#five",busStoreDayInfo1.getLastFiveStarReviewsNum()+""); content = content.replaceAll("#score",busStoreDayInfo1.getScore()); + content = content.replaceAll("#QRCode","https://youshi.bj.cn/prod-api/profile/upload/2024/07/19/img0_20240719111559A001.jpg"); int a = busStoreDayInfo1.getLastPositiveReviewsNum();//todo 好评-五星 int b = busStoreDayInfo1.getLastReturnVisitNum(); if (a != 0 && b != 0) { 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 e6543b2..cb4932b 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,8 @@ package com.ruoyi.business.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.business.domain.BusTemplateAttrConfig; +import com.ruoyi.business.service.IBusTemplateAttrConfigService; import com.ruoyi.common.utils.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -39,6 +41,9 @@ public class BusTemplateInfoController extends BaseController @Autowired private IBusTemplateInfoService busTemplateInfoService; + @Autowired + private IBusTemplateAttrConfigService busTemplateAttrConfigService; + /** * 查询模版列表 */ @@ -54,6 +59,14 @@ public class BusTemplateInfoController extends BaseController return getDataTable(list); } + @GetMapping("/listA") + public AjaxResult listA(BusTemplateAttrConfig busTemplateAttrConfig) + { + busTemplateAttrConfig.setTemplateType("word"); + busTemplateAttrConfig.setAttrStatus("1"); + List list = busTemplateAttrConfigService.selectBusTemplateAttrConfigList(busTemplateAttrConfig); + return AjaxResult.success(list); + } /** * 导出模版列表 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusTemplateInfo.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusTemplateInfo.java index 97d0b7f..76b43cc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusTemplateInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusTemplateInfo.java @@ -58,16 +58,6 @@ public class BusTemplateInfo extends BaseEntity private List attrInfoList; - private List attrConfigList; - - public List getAttrConfigList() { - return attrConfigList; - } - - public void setAttrConfigList(List attrConfigList) { - this.attrConfigList = attrConfigList; - } - public List getAttrInfoList() { return attrInfoList; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusTemplateInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusTemplateInfoServiceImpl.java index 33e67a2..6761f3c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusTemplateInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusTemplateInfoServiceImpl.java @@ -32,9 +32,6 @@ public class BusTemplateInfoServiceImpl implements IBusTemplateInfoService @Autowired private BusTemplateAttrInfoMapper busTemplateAttrInfoMapper; - @Autowired - private BusTemplateAttrConfigMapper busTemplateAttrConfigMapper; - @Autowired private RuoYiConfig ruoyiConfig; /** @@ -52,9 +49,7 @@ public class BusTemplateInfoServiceImpl implements IBusTemplateInfoService List list1 = busTemplateAttrInfoMapper.selectBusTemplateAttrInfoList(busTemplateAttrInfo); BusTemplateAttrConfig busTemplateAttrConfig = new BusTemplateAttrConfig(); busTemplateAttrConfig.setTemplateType("word"); - List list2 = busTemplateAttrConfigMapper.selectBusTemplateAttrConfigList(busTemplateAttrConfig); busTemplateInfo.setAttrInfoList(list1); - busTemplateInfo.setAttrConfigList(list2); return busTemplateInfo; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java index 6daa4f7..5f9ef88 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java @@ -123,6 +123,9 @@ public class MeituanServiceImpl implements IMeituanService { busStoreDayInfoMapper.insertBusStoreDayInfo(busStoreDayInfo); BusStoreConfigInfo busStoreConfigInfo = new BusStoreConfigInfo(); busStoreConfigInfo.setStoreCode(valueFromCookie("wmPoiId", cookie.getCookie())); + busStoreConfigInfo.setStoreName(storeInfo.getStoreName()); + busStoreConfigInfo.setQuotaStatus("2"); + busStoreConfigInfo.setIsSpliceOrder("N"); busStoreConfigInfoMapper.insertBusStoreConfigInfo(busStoreConfigInfo); } else if (list.size() == 1) { diff --git a/ruoyi-ui/src/api/statistics/template.js b/ruoyi-ui/src/api/statistics/template.js index c8f0b42..c9787e2 100644 --- a/ruoyi-ui/src/api/statistics/template.js +++ b/ruoyi-ui/src/api/statistics/template.js @@ -8,6 +8,13 @@ export function listTemplate(query) { params: query }) } +export function listTemplateAttr(query) { + return request({ + url: '/business/template/listA', + method: 'get', + params: query + }) +} // 查询模版详细 export function getTemplate(id) { diff --git a/ruoyi-ui/src/views/market/whole/index.vue b/ruoyi-ui/src/views/market/whole/index.vue index df3fea9..9aec17d 100644 --- a/ruoyi-ui/src/views/market/whole/index.vue +++ b/ruoyi-ui/src/views/market/whole/index.vue @@ -197,12 +197,12 @@