From 3b7a5fc95e6373d2ae76e2b29d92c99ddabc3f45 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Mon, 22 Jul 2024 16:33:42 +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-50%=EF=BC=8C=E5=B7=AE=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E9=9B=86=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusStoreInfoController.java | 9 ++++++++- .../ruoyi/business/req/ReqBusStoreConfigInfo.java | 3 +++ .../ruoyi/business/domain/BusStoreConfigInfo.java | 10 ++++++++++ .../service/impl/BusStoreInfoServiceImpl.java | 1 + .../business/service/impl/MeituanServiceImpl.java | 4 +++- .../mapper/business/BusStoreInfoMapper.xml | 6 +++++- ruoyi-ui/src/views/market/self/index.vue | 15 +++++++++++++++ ruoyi-ui/src/views/market/whole/index.vue | 15 +++++++++++++++ 8 files changed, 60 insertions(+), 3 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 eb5b736..fb47dba 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 @@ -254,10 +254,17 @@ public class BusStoreInfoController extends BaseController { public AjaxResult getStoreConfig(@PathVariable("storeCode") String storeCode) { BusStoreConfigInfo busStoreConfigInfo = new BusStoreConfigInfo(); busStoreConfigInfo.setStoreCode(storeCode); + BusStoreInfo busStoreInfo = new BusStoreInfo(); + busStoreInfo.setStoreCode(storeCode); + List busStoreInfoList = busStoreInfoService.selectBusStoreInfoList(busStoreInfo); + if(busStoreInfoList.size()==0){ + return error("店铺信息异常！"); + } List list = iBusStoreConfigInfoService.selectBusStoreConfigInfoList(busStoreConfigInfo); if (list.size() == 0) { - return success("新增配置"); + return error("请新增配置！"); } else if (list.size() == 1) { + list.get(0).setMarketingChannels(busStoreInfoList.get(0).getMarketingChannels()); return success(list.get(0)); } else { throw new ServiceException("数据重复！"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/req/ReqBusStoreConfigInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/business/req/ReqBusStoreConfigInfo.java index ba47224..04cc761 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/req/ReqBusStoreConfigInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/req/ReqBusStoreConfigInfo.java @@ -80,4 +80,7 @@ public class ReqBusStoreConfigInfo { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long saleBindId; + /** 备注 */ + @ApiModelProperty(name = "渠道") + private String marketingChannels; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusStoreConfigInfo.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusStoreConfigInfo.java index 6b83278..9dbcaf2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusStoreConfigInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusStoreConfigInfo.java @@ -84,6 +84,16 @@ public class BusStoreConfigInfo extends BaseEntity @Excel(name = "备注") private String remark; + private String marketingChannels; + + public String getMarketingChannels() { + return marketingChannels; + } + + public void setMarketingChannels(String marketingChannels) { + this.marketingChannels = marketingChannels; + } + @Excel(name = "归属销售id") private Long saleBindId; 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 a5f213c..b972473 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 @@ -191,6 +191,7 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService busStoreInfo.setSaleBindId(busSaleInfo.getId()); busStoreInfo.setSaleBindName(busSaleInfo.getSaleName()); busStoreInfo.setSaleBindTime(new Date()); + busStoreInfo.setMarketingChannels(busStoreConfigInfo.getMarketingChannels()); busStoreInfoMapper.updateBusStoreInfo(busStoreInfo); }else{ throw new ServiceException("店铺信息异常！"); 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 56655e4..18bfae5 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 @@ -115,6 +115,7 @@ public class MeituanServiceImpl implements IMeituanService { storeInfo.setGrantStatus("1");//授权登录状态 storeInfo.setReturnVisitStatus("2");// 营销状态 storeInfo.setSelfDeliveryStatus("1");// 1 正常， 2 自配送， 3 删除 + storeInfo.setMarketingChannels("AI");// 默认渠道 sysDictDataMapper.selectDictLabel("bus_default_script","default_script") busStoreInfoService.insertBusStoreInfo(storeInfo); BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo(); busStoreDayInfo.setStoreId(storeInfo.getId()); @@ -155,7 +156,8 @@ public class MeituanServiceImpl implements IMeituanService { storeInfo.setBindTime(date); storeInfo.setGrantStatus("1");//授权登录状态 storeInfo.setReturnVisitStatus("2");// 营销状态 - storeInfo.setSelfDeliveryStatus("1");// 1 正常， 2 自配送， 3 删除 + storeInfo.setSelfDeliveryStatus("1");// 1 正常， 2 自配送， 3 + storeInfo.setMarketingChannels("AI"); busStoreInfoService.insertBusStoreInfo(storeInfo); BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo(); busStoreDayInfo.setStoreId(storeInfo.getId()); diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml index b3e4ef0..76ee8b4 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml @@ -27,10 +27,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, platform_type, store_code, store_name, store_account, store_password, store_cookie, store_belong, grant_status, return_visit_status, bind_id, bind_user, bind_time, update_id, update_user, update_time, self_delivery_status, return_visit_user_range, sale_bind_id, sale_bind_name, sale_bind_time, price from bus_store_info + select id, platform_type, store_code, store_name, store_account, store_password, store_cookie, store_belong, grant_status, return_visit_status, bind_id, bind_user, bind_time, update_id, update_user, update_time, self_delivery_status, return_visit_user_range, sale_bind_id, sale_bind_name, sale_bind_time, price,marketing_channels from bus_store_info