From 3fb8fc0d2093a0646b11e5f2dc3b78bd6b633635 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 14 六月 2023 18:40:26 +0800
Subject: [PATCH] 活动管理
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 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 497cb16..41aa9b3 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
@@ -24,6 +24,7 @@
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import com.ruoyi.system.api.domain.vo.MgtShopIdByCodeVo;
+import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.service.RemoteOrderService;
@@ -33,8 +34,6 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -275,28 +274,24 @@
@Override
public void changeCooperationTime(MgtChangeCoopDto mgtChangeCoopDto){
Shop shop = this.getById(mgtChangeCoopDto.getShopId());
- String coopStartTime = mgtChangeCoopDto.getCoopStartTime();
- String coopEndTime = mgtChangeCoopDto.getCoopEndTime();
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- try {
- Date coopStartDate = simpleDateFormat.parse(coopStartTime);
- Date coopEndDate = simpleDateFormat.parse(coopEndTime);
- Date nowTime = new Date();
- shop.setCooperationStartTime(coopStartDate);
- shop.setCooperationEndTime(coopEndDate);
- Boolean inTime = false;
- if(coopStartDate.compareTo(nowTime)<0&&coopEndDate.compareTo(nowTime)>0){
- inTime = true;
- }
- if(shop.getShopStatus()==2&&inTime){
- shop.setShopStatus(1);
- }
- shop.setUpdateTime(nowTime);
- shop.setUpdateUserId(mgtChangeCoopDto.getUserId());
- this.saveOrUpdate(shop);
- } catch (ParseException e) {
- e.printStackTrace();
+ Date coopStartDate = mgtChangeCoopDto.getCoopStartTime();
+ Date coopEndDate = mgtChangeCoopDto.getCoopEndTime();
+ Date nowTime = new Date();
+ shop.setCooperationStartTime(coopStartDate);
+ shop.setCooperationEndTime(coopEndDate);
+ Boolean inTime = false;
+ if(coopStartDate.compareTo(nowTime)<=0&&coopEndDate.compareTo(nowTime)>=0){
+ inTime = true;
+ shop.setCooperativeFlag(1);
+ }else{
+ shop.setCooperativeFlag(0);
}
+ if(shop.getShopStatus()==2&&inTime){
+ shop.setShopStatus(1);
+ }
+ shop.setUpdateTime(nowTime);
+ shop.setUpdateUserId(mgtChangeCoopDto.getUserId());
+ this.saveOrUpdate(shop);
}
/**
@@ -559,4 +554,16 @@
public List<MgtShopListSimpleVo> listMgtShopSimpleVo(MgtShopListDto mgtShopListDto){
return shopMapper.listMgtShopSimpleVo(mgtShopListDto);
}
+
+ /**
+ * @description 通过id获取商户列表
+ * @author jqs
+ * @date 2023/6/14 17:53
+ * @param shopIds
+ * @return List<MgtShopListSimpleVo>
+ */
+ @Override
+ public List<MgtSimpleShopVo> listShopSimpleVoByIds(String shopIds){
+ return shopMapper.listShopSimpleVoByIds(shopIds);
+ }
}
--
Gitblit v1.7.1