From 8e1e0b93f40a4df4cb8120fcb1f18c0dca46d7b9 Mon Sep 17 00:00:00 2001 From: ywh <136o9815044@qq.com> Date: Sat, 17 Aug 2024 18:46:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E4=B8=AD?= =?UTF-8?q?=20=E8=B4=A6=E5=8F=B7=20OK888=20YS2024=20=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E4=B8=8B=20=E5=BA=97=E9=93=BA=E7=AE=A1=E7=90=86>>=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E7=AE=A1=E7=90=86=20=E4=B8=AD=20=E7=BC=96=E5=8F=B7163?= =?UTF-8?q?18844=20=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E6=8E=92=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/mapper/BusStoreConfigInfoMapper.java | 4 ++++ .../service/impl/BusStoreConfigInfoServiceImpl.java | 11 +++++++++++ .../service/impl/BusStoreInfoServiceImpl.java | 7 ++++++- .../business/service/impl/MeituanServiceImpl.java | 6 +++++- .../mapper/business/BusStoreConfigInfoMapper.xml | 8 ++++++++ 5 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreConfigInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreConfigInfoMapper.java index d727b94..2770da3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreConfigInfoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreConfigInfoMapper.java @@ -35,6 +35,8 @@ public interface BusStoreConfigInfoMapper */ public int insertBusStoreConfigInfo(BusStoreConfigInfo busStoreConfigInfo); + public Integer countBusStoreConfigInfo(String storeCode); + /** * 修改店铺配置信息 * @@ -59,4 +61,6 @@ public interface BusStoreConfigInfoMapper */ public int deleteBusStoreConfigInfoByIds(Long[] ids); + public int deleteBusStoreConfigInfoByCode(String storeCode); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreConfigInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreConfigInfoServiceImpl.java index 33a3414..f248ccb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreConfigInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreConfigInfoServiceImpl.java @@ -1,11 +1,14 @@ package com.ruoyi.business.service.impl; import java.util.List; + +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.business.mapper.BusStoreConfigInfoMapper; import com.ruoyi.business.domain.BusStoreConfigInfo; import com.ruoyi.business.service.IBusStoreConfigInfoService; +import org.springframework.transaction.annotation.Transactional; /** * 店铺配置信息Service业务层处理 @@ -49,9 +52,17 @@ public class BusStoreConfigInfoServiceImpl implements IBusStoreConfigInfoService * @param busStoreConfigInfo 店铺配置信息 * @return 结果 */ + @Transactional @Override public int insertBusStoreConfigInfo(BusStoreConfigInfo busStoreConfigInfo) { + if(busStoreConfigInfo != null && StringUtils.isNotBlank(busStoreConfigInfo.getStoreCode())){ + String storeCode = busStoreConfigInfo.getStoreCode(); + Integer c = busStoreConfigInfoMapper.countBusStoreConfigInfo(storeCode); + if(c > 0){ + busStoreConfigInfoMapper.deleteBusStoreConfigInfoByCode(storeCode); + } + } return busStoreConfigInfoMapper.insertBusStoreConfigInfo(busStoreConfigInfo); } 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 c61a3e5..f0ba224 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 @@ -11,6 +11,7 @@ import com.ruoyi.business.domain.resp.RespBusStoreInfo; import com.ruoyi.business.mapper.BusMarketOperationInfoMapper; import com.ruoyi.business.mapper.BusSaleInfoMapper; import com.ruoyi.business.mapper.BusStoreConfigInfoMapper; +import com.ruoyi.business.service.IBusStoreConfigInfoService; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; @@ -44,6 +45,9 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService @Autowired private BusMarketOperationInfoMapper busMarketOperationInfoMapper; + @Autowired + private IBusStoreConfigInfoService busStoreConfigInfoService; + /** * 查询店铺信息 * @@ -225,7 +229,8 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService List ll = busStoreConfigInfoMapper.selectBusStoreConfigInfoList(busStoreConfigInfo1); // 配置新增修改 if(ll.size() == 0){ - count = busStoreConfigInfoMapper.insertBusStoreConfigInfo(busStoreConfigInfo); +// count = busStoreConfigInfoMapper.insertBusStoreConfigInfo(busStoreConfigInfo); + count = busStoreConfigInfoService.insertBusStoreConfigInfo(busStoreConfigInfo); }else if(ll.size() ==1){ busStoreConfigInfo.setId(ll.get(0).getId()); if(StringUtils.isEmpty(busStoreConfigInfo.getMarketingChannels())){ 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 b691501..98b9293 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 @@ -92,6 +92,9 @@ public class MeituanServiceImpl implements IMeituanService { @Autowired private BusStoreDayHistoryInfoMapper busStoreDayHistoryInfoMapper; + @Autowired + private IBusStoreConfigInfoService busStoreConfigInfoService; + private static CloseableHttpClient client1 = HttpClientBuilder.create().build(); /** @@ -158,7 +161,8 @@ public class MeituanServiceImpl implements IMeituanService { busStoreConfigInfo.setMinOrderNum(1); busStoreConfigInfo.setMaxOrderNum(1); busStoreConfigInfo.setSelfDeliveryDuration(60); - busStoreConfigInfoMapper.insertBusStoreConfigInfo(busStoreConfigInfo); +// busStoreConfigInfoMapper.insertBusStoreConfigInfo(busStoreConfigInfo); + busStoreConfigInfoService.insertBusStoreConfigInfo(busStoreConfigInfo); } else if (list.size() == 1) { // 不同代理人绑定 diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreConfigInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreConfigInfoMapper.xml index 1ab13bf..096710f 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusStoreConfigInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreConfigInfoMapper.xml @@ -63,6 +63,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + delete from bus_store_config_info where store_code = #{storeCode} + + insert into bus_store_config_info