From 60b171f1660d28e6d167584954b9159ff77ad5df Mon Sep 17 00:00:00 2001 From: wangshuai Date: Mon, 22 Jul 2024 15:09:10 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9B=E8=90=A5=E9=94=80=E6=B8=A0=E9=81=93A?= =?UTF-8?q?I/=E7=9F=AD=E4=BF=A1=EF=BC=88=E6=99=AE=E9=80=9A=EF=BC=8C?= =?UTF-8?q?=E5=AE=89=E5=85=A8=EF=BC=89-30%=EF=BC=8C=E5=B7=AE=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E9=9B=86=E6=88=90=202=EF=BC=9B=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=BA=94=E7=94=A8=EF=BC=8C=E9=9B=86=E6=88=90=E9=A5=BF=E4=BA=86?= =?UTF-8?q?=E4=B9=88=EF=BC=88=E5=BC=95=E5=85=A5sdk=EF=BC=89-10%=203?= =?UTF-8?q?=EF=BC=9B=E6=B5=81=E6=B0=B4=E6=98=8E=E7=BB=86=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6-=E5=AE=8C=E6=88=90=204=EF=BC=9B=E9=BB=91?= =?UTF-8?q?=E5=90=8D=E5=8D=95=EF=BC=8C=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4-=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusBanOperateController.java | 2 +- .../BusIntegralRecordController.java | 17 ++++++------- .../controller/BusOrderInfoController.java | 9 ++++++- .../ruoyi/business/req/ReqBusStoreInfo.java | 3 +++ .../src/main/resources/application.yml | 5 ++++ ruoyi-common/pom.xml | 20 +++++++++++++++- .../ruoyi/common/config/ElemeProperties.java | 18 ++++++++++++++ .../ruoyi/business/domain/BusStoreInfo.java | 10 ++++++++ .../business/mapper/BusOrderInfoMapper.java | 1 + .../service/IBusOrderInfoService.java | 2 ++ .../business/service/impl/AiServiceImpl.java | 9 ++++++- .../service/impl/BusOrderInfoServiceImpl.java | 5 ++++ .../business/BusIntegralRecordMapper.xml | 4 ++-- .../mapper/business/BusOrderInfoMapper.xml | 12 ++++++++++ .../mapper/business/BusStoreInfoMapper.xml | 1 + ruoyi-ui/src/views/market/self/index.vue | 21 +++++++++++++--- ruoyi-ui/src/views/market/whole/index.vue | 21 +++++++++++++--- ruoyi-ui/src/views/point/detail/index.vue | 4 ++-- ruoyi-ui/src/views/statistics/black/index.vue | 24 +++++++++++++------ 19 files changed, 159 insertions(+), 29 deletions(-) create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/config/ElemeProperties.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusBanOperateController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusBanOperateController.java index d6b270b..34b6792 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusBanOperateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusBanOperateController.java @@ -123,7 +123,7 @@ public class BusBanOperateController extends BaseController /** * 删除免运营订单信息 */ - @PreAuthorize("@ss.hasPermi('system:info:remove')") +// @PreAuthorize("@ss.hasPermi('system:info:remove')") @Log(title = "免运营订单信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralRecordController.java index aa6df90..240aa1b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralRecordController.java @@ -50,14 +50,15 @@ public class BusIntegralRecordController extends BaseController public TableDataInfo list(BusIntegralRecord busIntegralRecord) { if(!"admin".equals(SecurityUtils.getLoginUser().getUsername())){ - BusAgentInfo agentInfo = new BusAgentInfo(); - agentInfo.setSuperiorAgentAccount(SecurityUtils.getLoginUser().getUsername()); - List busAgentInfoList = agentInfoService.selectBusAgentInfoList(agentInfo); - List list = busAgentInfoList.stream() - .map(BusAgentInfo::getAgentAccount) // 抽取用户名属性 - .collect(Collectors.toList()); - list.add(SecurityUtils.getLoginUser().getUsername()); - busIntegralRecord.setAgentAccount(list); +// BusAgentInfo agentInfo = new BusAgentInfo(); +// agentInfo.setSuperiorAgentAccount(SecurityUtils.getLoginUser().getUsername()); +// List busAgentInfoList = agentInfoService.selectBusAgentInfoList(agentInfo); +// List list = busAgentInfoList.stream() +// .map(BusAgentInfo::getAgentAccount) // 抽取用户名属性 +// .collect(Collectors.toList()); +// list.add(SecurityUtils.getLoginUser().getUsername()); +// busIntegralRecord.setAgentAccount(list); + busIntegralRecord.setAccount(SecurityUtils.getLoginUser().getUsername()); } startPage(); List list = busIntegralRecordService.selectBusIntegralRecordListA(busIntegralRecord); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusOrderInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusOrderInfoController.java index d326bd6..8702052 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusOrderInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusOrderInfoController.java @@ -1,7 +1,10 @@ package com.ruoyi.business.controller; +import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.utils.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -42,7 +45,11 @@ public class BusOrderInfoController extends BaseController public TableDataInfo list(BusOrderInfo busOrderInfo) { startPage(); - List list = busOrderInfoService.selectBusOrderInfoList(busOrderInfo); + List list = new ArrayList<>(); + if(StringUtils.isEmpty(busOrderInfo.getStoreCode())&&StringUtils.isEmpty(busOrderInfo.getOrderNo())){ + return getDataTable(list); + } + list = busOrderInfoService.selectBusOrderInfoListA(busOrderInfo); // list.forEach(System.out::println); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/req/ReqBusStoreInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/business/req/ReqBusStoreInfo.java index 7e4b3cc..464e6e6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/req/ReqBusStoreInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/req/ReqBusStoreInfo.java @@ -44,4 +44,7 @@ public class ReqBusStoreInfo extends BaseEntity { /** 店铺状态 */ @ApiModelProperty(name = "店铺状态：1正常，2自配送，3删除") private String selfDeliveryStatus; + /** 回访渠道 */ + @ApiModelProperty(name = "回访渠道") + private String marketingChannels; } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 0eee4cb..4bcec5d 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -150,3 +150,8 @@ clientIP: accountsecretKey: 2xib03rq8uqh15x230ea9emjasiu3exv secretId: ohrruf71orkzv9l9enhi secretKey: bp4iyx52tc9oe46hj0lriyux2m6hpzvu + +eleme: + isSandbox: false + appKey: key + appSecret: secret diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index c82405a..393367d 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -124,6 +124,14 @@ tencentcloud-sdk-java + + me.ele.openapi + eleme-openapi-sdk + 1.30.58 + system + ${project.basedir}/../lib/eleme-openapi-sdk-1.30.58.jar + + org.projectlombok lombok @@ -152,5 +160,15 @@ - + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/ElemeProperties.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/ElemeProperties.java new file mode 100644 index 0000000..27d5555 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/ElemeProperties.java @@ -0,0 +1,18 @@ +package com.ruoyi.common.config; + +import lombok.Data; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +@Data +@Configuration +public class ElemeProperties { + + @Value("${eleme.isSandbox}") + private String isSandbox; + @Value("${eleme.appKey}") + private String appKey; + @Value("${eleme.appSecret}") + private String appSecret; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusStoreInfo.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusStoreInfo.java index 107ab63..92ade84 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusStoreInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusStoreInfo.java @@ -118,6 +118,16 @@ public class BusStoreInfo extends BaseEntity private BigDecimal price; + private String marketingChannels; + + public String getMarketingChannels() { + return marketingChannels; + } + + public void setMarketingChannels(String marketingChannels) { + this.marketingChannels = marketingChannels; + } + public BigDecimal getPrice() { return price; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusOrderInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusOrderInfoMapper.java index da7d736..eccb623 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusOrderInfoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusOrderInfoMapper.java @@ -65,4 +65,5 @@ public interface BusOrderInfoMapper List selectBusOrderInfoListToAi(@Param("storeCode") String storeCode, @Param("t1") String t1,@Param("t2") String t2); List selectBusZpsOrderInfoListToAi(@Param("storeCode") String storeCode, @Param("t2") String t2); + List selectBusOrderInfoListA(BusOrderInfo busOrderInfo); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusOrderInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusOrderInfoService.java index 753774d..bc723f3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusOrderInfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusOrderInfoService.java @@ -62,4 +62,6 @@ public interface IBusOrderInfoService List selectBusOrderInfoListToAi(String storeCode, String t1, String t2); List selectBusZpsOrderInfoListToAi(String storeCode, String t2); + + List selectBusOrderInfoListA(BusOrderInfo busOrderInfo); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java index 482ebcd..07591b9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java @@ -360,7 +360,11 @@ public class AiServiceImpl implements IAiService { List listInfo = fifteenInfoService.selectBusFifteenInfoList(fifteenInfo); if (listInfo.size() == 0) { System.out.println("话术：" + content + "; order" + busOrderInfo.toString()); - sendAiTask(content,busOrderInfo); + if("AI".equals(busStoreInfo.getMarketingChannels())){ + sendAiTask(content,busOrderInfo); + }else{ + sendSmsTask(); + } }else { BusAgentInfo busAgentInfo = agentInfoL.get(0); int a = 1; @@ -388,6 +392,9 @@ public class AiServiceImpl implements IAiService { } } + private void sendSmsTask() { + } + private void addAiTaskTest(String apiKey, String content, BusOrderInfo busOrderInfo) { // String apiKey = Optional.ofNullable(redisTemplate.opsForValue().get("apiKey")).orElse(null); String phoneNo = busOrderInfo.getPrivcyPhone().split(",")[0]; diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusOrderInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusOrderInfoServiceImpl.java index ce104f6..072a427 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusOrderInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusOrderInfoServiceImpl.java @@ -101,4 +101,9 @@ public class BusOrderInfoServiceImpl implements IBusOrderInfoService return busOrderInfoMapper.selectBusZpsOrderInfoListToAi(storeCode, t2); } + @Override + public List selectBusOrderInfoListA(BusOrderInfo busOrderInfo) { + return busOrderInfoMapper.selectBusOrderInfoListA(busOrderInfo); + } + } diff --git a/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml index 312dd62..0c2a939 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml @@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + insert into bus_order_info (id,store_code,store_name,custom_id,order_no,order_status,complete_time,dayseq,order_count,order_time,is_phf) values diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml index f432478..b3e4ef0 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml @@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and update_id = #{updateId} and update_user = #{updateUser} and self_delivery_status = #{selfDeliveryStatus} + and marketing_channels = #{marketingChannels} and return_visit_user_range = #{returnVisitUserRange} and sale_bind_id = #{saleBindId} and sale_bind_name like concat('%', #{saleBindName}, '%') diff --git a/ruoyi-ui/src/views/market/self/index.vue b/ruoyi-ui/src/views/market/self/index.vue index 21429d7..892d587 100644 --- a/ruoyi-ui/src/views/market/self/index.vue +++ b/ruoyi-ui/src/views/market/self/index.vue @@ -98,7 +98,21 @@ - + + + + + @@ -367,7 +381,7 @@ import { listSaleA} from "@/api/business/sale"; export default { name: "Role", - dicts: ['sys_yes_no','sys_grant_status','sys_platform_type','sys_return_visit_status','bus_script_type'], + dicts: ['sys_yes_no','sys_grant_status','sys_platform_type','sys_return_visit_status','bus_script_type','bus_marketing_channels'], data() { return { meituanUrl: "https://e.waimai.meituan.com?ABC="+this.$store.state.user.name+":1", @@ -411,7 +425,8 @@ export default { saleBindId: undefined, grantStatus: undefined, returnVisitStatus: undefined, - selfDeliveryStatus: 2 + selfDeliveryStatus: 2, + marketingChannels: 'AI' }, saleList: [], timeRange: undefined, diff --git a/ruoyi-ui/src/views/market/whole/index.vue b/ruoyi-ui/src/views/market/whole/index.vue index f6eed68..02d5fe0 100644 --- a/ruoyi-ui/src/views/market/whole/index.vue +++ b/ruoyi-ui/src/views/market/whole/index.vue @@ -98,7 +98,21 @@ - + + + + + @@ -434,7 +448,7 @@ import { listSaleA} from "@/api/business/sale"; export default { name: "Role", - dicts: ['sys_yes_no','sys_grant_status','sys_platform_type','sys_return_visit_status','bus_script_type'], + dicts: ['sys_yes_no','sys_grant_status','sys_platform_type','sys_return_visit_status','bus_script_type','bus_marketing_channels'], data() { return { meituanUrl: "https://e.waimai.meituan.com?ABC="+this.$store.state.user.name+":1", @@ -481,7 +495,8 @@ export default { saleBindId: undefined, grantStatus: undefined, returnVisitStatus: undefined, - selfDeliveryStatus: 1 + selfDeliveryStatus: 1, + marketingChannels: 'AI' }, queryParams1: { content: undefined diff --git a/ruoyi-ui/src/views/point/detail/index.vue b/ruoyi-ui/src/views/point/detail/index.vue index 7c6165e..82241ce 100644 --- a/ruoyi-ui/src/views/point/detail/index.vue +++ b/ruoyi-ui/src/views/point/detail/index.vue @@ -1,14 +1,14 @@