From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index 41aa9b3..a1d2674 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.security.utils.CodeFactoryUtil;
@@ -34,6 +35,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.text.ParseException;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -274,8 +276,14 @@
@Override
public void changeCooperationTime(MgtChangeCoopDto mgtChangeCoopDto){
Shop shop = this.getById(mgtChangeCoopDto.getShopId());
- Date coopStartDate = mgtChangeCoopDto.getCoopStartTime();
- Date coopEndDate = mgtChangeCoopDto.getCoopEndTime();
+ Date coopStartDate = null;
+ Date coopEndDate = null;
+ try {
+ coopStartDate = DateUtils.parseDate(mgtChangeCoopDto.getCoopStartTime(),"yyyy-MM-dd");
+ coopEndDate = DateUtils.parseDate(mgtChangeCoopDto.getCoopEndTime(),"yyyy-MM-dd");
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
Date nowTime = new Date();
shop.setCooperationStartTime(coopStartDate);
shop.setCooperationEndTime(coopEndDate);
@@ -566,4 +574,30 @@
public List<MgtSimpleShopVo> listShopSimpleVoByIds(String shopIds){
return shopMapper.listShopSimpleVoByIds(shopIds);
}
+
+ /**
+ * @description pageMgtShopByCityCode
+ * @param page
+ * @param mgtShopByCodePageDto
+ * @return List<MgtSimpleShopVo>
+ * @author jqs34
+ * @date 2023/6/14 20:56
+ */
+ @Override
+ public List<MgtSimpleShopVo> pageMgtShopByCityCode(Page page, MgtShopByCodePageDto mgtShopByCodePageDto){
+ return shopMapper.pageMgtShopByCityCode(page, mgtShopByCodePageDto);
+ }
+
+ /**
+ * @description pageMgtShopAuth
+ * @param page
+ * @param mgtShopAuthPageDto
+ * @return List<MgtShopAuthPageVo>
+ * @author jqs34
+ * @date 2023/6/14 23:01
+ */
+ @Override
+ public List<MgtShopAuthPageVo> pageMgtShopAuth(Page page, MgtShopAuthPageDto mgtShopAuthPageDto){
+ return shopMapper.pageMgtShopAuth(page, mgtShopAuthPageDto);
+ }
}
--
Gitblit v1.7.1