From 9e7b5dd397e17fe141cc7630df51699125857756 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期二, 20 六月 2023 18:35:35 +0800 Subject: [PATCH] BUG修复和营销统计 --- ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 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 a526860..633ecf9 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 @@ -271,6 +271,40 @@ } /** + * @description 终止合作 + * @author jqs + * @date 2023/6/20 12:01 + * @param mgtTerminateCooperationDto + * @return void + */ + @Override + public void terminateMgtCooperation(MgtTerminateCooperationDto mgtTerminateCooperationDto){ + Shop shop = this.getById(mgtTerminateCooperationDto.getShopId()); + if(mgtTerminateCooperationDto.getCooperativeFlag()==1){ + /*Date coopStartDate = shop.getCooperationStartTime(); + Date coopEndDate = shop.getCooperationEndTime(); + Date nowTime = new Date(); + //判断合作时间 没在时间内不能开启 + if(coopStartDate.compareTo(nowTime)>0&&coopEndDate.compareTo(nowTime)<0){ + throw new ServiceException(AppErrorConstant.COOPERATION_TIME_ERROR); + }*/ + shop.setCooperativeFlag(1); + if(shop.getShopStatus()==2&&shop.getFrozenFlag()==0){ + shop.setShopStatus(1); + }else if(shop.getShopStatus()==2&&shop.getFrozenFlag()==1){ + shop.setShopStatus(0); + } + }else{ + shop.setCooperativeFlag(0); + shop.setShopStatus(2); + } + shop.setUpdateTime(new Date()); + shop.setUpdateUserId(mgtTerminateCooperationDto.getUserId()); + this.saveOrUpdate(shop); + } + + + /** * 修改合作时间 * @param mgtChangeCoopDto */ -- Gitblit v1.7.1