完善门店管理

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysStoreController.java

@@ -6,9 +6,7 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.dromara.system.domain.bo.SysStoreBanBo;
-import org.dromara.system.domain.bo.SysStorePageBo;
-import org.dromara.system.domain.bo.SysStoreRenewBo;
+import org.dromara.system.domain.bo.*;
 import org.dromara.system.domain.vo.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
@@ -21,7 +19,6 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.system.domain.bo.SysStoreBo;
 import org.dromara.system.service.ISysStoreService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
@@ -148,6 +145,12 @@ public class SysStoreController extends BaseController {
         return toAjax(sysStoreService.ban(bo));
     }
 
+    @RepeatSubmit()
+    @PutMapping("/enable")
+    public R<Void> enable(@RequestBody SysStoreEnableBo bo) {
+        return toAjax(sysStoreService.enable(bo));
+    }
+
     @GetMapping("/listOnDispatch")
     public R<List<SysStoreDispatchVo>> listOnDispatch(@RequestParam Long site) {
         return R.ok(sysStoreService.listOnDispatch(site));

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysStoreEnableBo.java

@@ -0,0 +1,10 @@
+package org.dromara.system.domain.bo;
+
+import lombok.Data;
+
+@Data
+public class SysStoreEnableBo {
+
+    private Long id;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysStoreService.java

@@ -1,11 +1,8 @@
 package org.dromara.system.service;
 
 import org.dromara.system.domain.SysStore;
-import org.dromara.system.domain.bo.SysStoreBanBo;
-import org.dromara.system.domain.bo.SysStorePageBo;
-import org.dromara.system.domain.bo.SysStoreRenewBo;
+import org.dromara.system.domain.bo.*;
 import org.dromara.system.domain.vo.*;
-import org.dromara.system.domain.bo.SysStoreBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 
@@ -85,4 +82,6 @@ public interface ISysStoreService {
     boolean ban(SysStoreBanBo bo);
 
     List<SysStoreDispatchVo> listOnDispatch(Long site);
+
+    boolean enable(SysStoreEnableBo bo);
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysStoreServiceImpl.java

@@ -22,16 +22,13 @@ import org.dromara.service.api.domain.bo.RemoteStoreServiceBo;
 import org.dromara.system.constants.StoreConstants;
 import org.dromara.system.domain.SysAreaStation;
 import org.dromara.system.domain.SysUserStore;
-import org.dromara.system.domain.bo.SysStoreBanBo;
-import org.dromara.system.domain.bo.SysStorePageBo;
-import org.dromara.system.domain.bo.SysStoreRenewBo;
+import org.dromara.system.domain.bo.*;
 import org.dromara.system.domain.vo.*;
 import org.dromara.system.enums.AreaStationStatusEnum;
 import org.dromara.system.enums.SysStoreStatusEnum;
 import org.dromara.system.mapper.SysAreaStationMapper;
 import org.dromara.system.mapper.SysUserStoreMapper;
 import org.springframework.stereotype.Service;
-import org.dromara.system.domain.bo.SysStoreBo;
 import org.dromara.system.domain.SysStore;
 import org.dromara.system.mapper.SysStoreMapper;
 import org.dromara.system.service.ISysStoreService;
@@ -159,6 +156,7 @@ public class SysStoreServiceImpl implements ISysStoreService {
     public Boolean insertByBo(SysStoreBo bo) {
         SysStore add = MapstructUtils.convert(bo, SysStore.class);
         validEntityBeforeSave(add);
+        add.setStatus(SysStoreStatusEnum.IN_OPERATION.getValue());
         boolean flag = baseMapper.insert(add) == 0;
         if (flag) {
             throw new RuntimeException("插入失败");
@@ -312,7 +310,7 @@ public class SysStoreServiceImpl implements ISysStoreService {
         return baseMapper.update(
             Wrappers.lambdaUpdate(SysStore.class)
                 .eq(SysStore::getId, bo.getId())
-                .set(SysStore::getEndBusinessTime, bo.getTo())
+                .set(SysStore::getValidity, bo.getTo())
                 .set(SysStore::getStatus, SysStoreStatusEnum.IN_OPERATION.getValue())
         ) > 0;
     }
@@ -348,4 +346,13 @@ public class SysStoreServiceImpl implements ISysStoreService {
 
         return vos;
     }
+
+    @Override
+    public boolean enable(SysStoreEnableBo bo) {
+        return baseMapper.update(
+            Wrappers.lambdaUpdate(SysStore.class)
+                .eq(SysStore::getId, bo.getId())
+                .set(SysStore::getStatus, SysStoreStatusEnum.IN_OPERATION.getValue())
+        ) > 0;
+    }
 }