Merge remote-tracking branch 'origin/master'

gly-base-core/src/main/java/cn/com/taiji/core/entity/basic/QtkAgency.java

@@ -2,6 +2,7 @@ package cn.com.taiji.core.entity.basic;
 
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
 import cn.com.taiji.common.entity.StringUUIDEntity;
+import cn.com.taiji.core.entity.dict.basic.EnableFlag;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -111,7 +112,7 @@ public class QtkAgency extends StringPropertyUUIDEntity {
     private String merchantId;//商户号*/
     @NotNull
     @Column(name = "STATUS")
-    private Integer status = 1;//状态,1-启用 0-停用
+    private EnableFlag status = EnableFlag.ENABLE;
    /* @Size(max = 64)
     @Column(name = "AGREEMENT_NAME")
     private String agreementName;//协议名称

gly-base-core/src/main/java/cn/com/taiji/core/entity/basic/QtkServiceHall.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.core.entity.basic;
 
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.basic.EnableFlag;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -106,7 +107,7 @@ public class QtkServiceHall extends StringPropertyUUIDEntity {
     @Column(name = "INFO")
     private String info;//备注
     @Column(name = "STATE")
-    private Integer state = 1;//状态，1启用，0停用
+    private EnableFlag state =  EnableFlag.ENABLE;
     @Column(name = "INSERT_TIME")
     private LocalDateTime insertTime = LocalDateTime.now();//创建时间
     @Column(name = "UPDATE_TIME")

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/basic/EnableFlag.java

@@ -0,0 +1,24 @@
+package cn.com.taiji.core.entity.dict.basic;
+
+/**
+ * @Author weicailin
+ * @Date 2023/3/22 17:38
+ * @Email 13079168756@163.com
+ */
+public enum EnableFlag {
+    ENABLE("可使用") {},
+    DISABLE("禁用") {},
+    ;
+
+    private final String value;
+
+    EnableFlag(String value) {
+        this.value = value;
+
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+}

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/bls/CardQueryRequest.java

@@ -13,7 +13,7 @@ import java.util.List;
 @Getter
 @Setter
 @Accessors(chain = true)
-public class CardQueryRequest extends AbstractBlsRequest<AbstractBlsResponse> {
+public class CardQueryRequest extends AbstractBlsRequest<CardQueryResponse> {
 
     private CardBlackType type;// 类型
     private String cardId;// 卡号

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/bls/CardQueryResponse.java

@@ -1,6 +1,5 @@
 package cn.com.taiji.core.model.comm.protocol.bls;
 
-import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -8,7 +7,7 @@ import java.util.List;
 
 @Getter
 @Setter
-public class CardQueryResponse extends AbstractSignTypeResponse {
+public class CardQueryResponse extends AbstractBlsResponse {
 
      private List<CardQueryModel> results;
 }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/bls/ObuQueryRequest.java

@@ -1,7 +1,6 @@
 package cn.com.taiji.core.model.comm.protocol.bls;
 
 
-import cn.com.taiji.core.entity.dict.basic.CardBlackType;
 import cn.com.taiji.core.entity.dict.basic.ObuBlackType;
 import cn.com.taiji.core.model.comm.protocol.valid.ErrorMsgBuilder;
 import lombok.Getter;
@@ -14,7 +13,7 @@ import java.util.List;
 @Getter
 @Setter
 @Accessors(chain = true)
-public class ObuQueryRequest extends AbstractBlsRequest<AbstractBlsResponse> {
+public class ObuQueryRequest extends AbstractBlsRequest<ObuQueryResponse> {
 
     private ObuBlackType type;// 类型
     private String obuId;// 卡号

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/bls/ObuQueryResponse.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 @Getter
 @Setter
-public class ObuQueryResponse extends AbstractSignTypeResponse {
+public class ObuQueryResponse extends AbstractBlsResponse {
 
      private List<ObuQueryModel> results;
 }

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/basic/QtkAgencyRepo.java

@@ -3,6 +3,7 @@ package cn.com.taiji.core.repo.jpa.basic;
 import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
 import cn.com.taiji.core.entity.basic.QtkAgency;
 import cn.com.taiji.core.entity.basic.QtkServiceHall;
+import cn.com.taiji.core.entity.dict.basic.EnableFlag;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.transaction.annotation.Transactional;
@@ -26,7 +27,7 @@ public interface QtkAgencyRepo extends AbstractJpaRepo<QtkAgency, String>{
     @Modifying
     @Transactional
     @Query("update  QtkAgency set status =?1 ,updateTime = ?2 where agencyId = ?3")
-    int updateState(Integer state, LocalDateTime updateTime, String agencyId);
+    int updateState(EnableFlag state, LocalDateTime updateTime, String agencyId);
 
     @Query("from QtkAgency where name  like ?1 ")
     public List<QtkAgency> listByNameLike(String likeName);

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/basic/QtkServicehallRepo.java

@@ -2,6 +2,7 @@ package cn.com.taiji.core.repo.jpa.basic;
 
 import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
 import cn.com.taiji.core.entity.basic.QtkServiceHall;
+import cn.com.taiji.core.entity.dict.basic.EnableFlag;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.transaction.annotation.Transactional;
@@ -32,7 +33,7 @@ public interface QtkServicehallRepo extends AbstractJpaRepo<QtkServiceHall, Stri
     @Modifying
     @Transactional
     @Query("update  QtkServiceHall set state =?1 ,updateTime = ?2 where serviceHallId = ?3")
-    int updateState(Integer state, LocalDateTime updateTime, String serviceHallId);
+    int updateState(EnableFlag state, LocalDateTime updateTime, String serviceHallId);
 
 
 

zhywpt-app-managew/build.gradle

@@ -14,6 +14,7 @@ dependencies {
     implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery"
     implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config"
     implementation "org.springframework.cloud:spring-cloud-starter-openfeign"
+    implementation "org.springframework.boot:spring-boot-starter-data-redis"
     implementation(group: 'io.springfox', name: 'springfox-boot-starter', version: '3.0.0') {
 //        exclude group: 'net.bytebuddy',module: 'byte-buddy'
     }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/MyValidController.java

@@ -5,6 +5,7 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolationException;
 
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.transaction.TransactionSystemException;
 import org.springframework.validation.BindException;
@@ -84,6 +85,14 @@ public abstract class MyValidController extends BaseController {
         jsonResponse(apiResponse, response);
     }
 
+    @ExceptionHandler(ServiceHandleException.class)
+    public void handleServiceHandleException(ServiceHandleException e, HttpServletResponse response) throws IOException {
+        logger.debug("handle ServiceHandleException:{}", e.getMessage());
+        ResponseCode code = ResponseCode.BUSINESS_VALIDATE_ERR;
+        ApiResponse<Object> apiResponse = ApiResponse.of(code.getCode(), e.getMessage());
+        jsonResponse(apiResponse, response);
+    }
+
     /**
      * 异常信息以json格式返回，前台可以用jquery进行处理
      */

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/equity/CouponController.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.managew.api.equity;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.web.ApiResponse;
 import cn.com.taiji.core.entity.issue.IssueCouponInfo;
@@ -27,14 +28,14 @@ public class CouponController extends MyValidController {
 
     @ApiOperation("卡券类型-新增")
     @PostMapping("/add")
-    public ApiResponse<?> add(@Valid @RequestBody CouponAddRequestDTO req) {
+    public ApiResponse<?> add(@Valid @RequestBody CouponAddRequestDTO req) throws ServiceHandleException {
         couponManager.add(req);
         return ApiResponse.success().setMessage("新增成功");
     }
 
     @ApiOperation("卡券类型-编辑")
     @PostMapping("/edit")
-    public ApiResponse<?> edit(@Valid @RequestBody CouponEditRequestDTO req) {
+    public ApiResponse<?> edit(@Valid @RequestBody CouponEditRequestDTO req) throws ServiceHandleException {
         couponManager.edit(req);
         return ApiResponse.success().setMessage("更改成功");
     }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/CouponAddRequestDTO.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.managew.dto.equity;
 
 import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
-import cn.com.taiji.managew.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,7 +17,7 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @ApiModel(description = "卡券-新增请求参数")
-public class CouponAddRequestDTO extends AbstractBizRequestDTO {
+public class CouponAddRequestDTO extends AbstractStaffBizRequestDTO {
 
     /**
      * 卡券权益所属渠道

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/CouponDeleteRequestDTO.java

@@ -1,7 +1,6 @@
 package cn.com.taiji.managew.dto.equity;
 
-import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.managew.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,7 +14,7 @@ import javax.validation.constraints.NotBlank;
  */
 @ApiModel(description = "卡券-删除")
 @Data
-public class CouponDeleteRequestDTO extends AbstractBizRequestDTO {
+public class CouponDeleteRequestDTO extends AbstractStaffBizRequestDTO {
 
     @NotBlank
     @ApiModelProperty(value = "卡券主键ID", required = true)

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/CouponDetailImportRequestDTO.java

@@ -1,11 +1,9 @@
 package cn.com.taiji.managew.dto.equity;
 
-import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.managew.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.constraints.NotBlank;
 
@@ -14,7 +12,7 @@ import javax.validation.constraints.NotBlank;
  */
 @ApiModel("卡券详情-批量导入")
 @Data
-public class CouponDetailImportRequestDTO extends AbstractBizRequestDTO {
+public class CouponDetailImportRequestDTO extends AbstractStaffBizRequestDTO {
 
     @ApiModelProperty(value = "excel文件的url下载地址")
     @NotBlank

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/CouponDetailPageRequestDTO.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.managew.dto.equity;
 
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.core.entity.dict.issue.CouponStatus;
-import cn.com.taiji.managew.dto.AbstractBizPageRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,7 +16,7 @@ import javax.validation.constraints.NotBlank;
  */
 @Data
 @ApiModel(description = "卡券详情-分页查询")
-public class CouponDetailPageRequestDTO extends AbstractBizPageRequestDTO {
+public class CouponDetailPageRequestDTO extends AbstractStaffBizRequestDTO {
 
 
     @ApiModelProperty(value = "卡券id（属于指定类型卡券）")

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/CouponEditRequestDTO.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.managew.dto.equity;
 
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
-import cn.com.taiji.managew.dto.AbstractBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull;
  */
 @ApiModel(description = "卡券-编辑")
 @Data
-public class CouponEditRequestDTO extends AbstractBizRequestDTO {
+public class CouponEditRequestDTO extends AbstractStaffBizRequestDTO {
 
     @ApiModelProperty(value = "卡券主键ID", required = true)
     @NotBlank(message = "id不能为空")

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/CouponEnableListRequestDTO.java

@@ -1,12 +1,11 @@
 package cn.com.taiji.managew.dto.equity;
 
 
-import cn.com.taiji.managew.dto.AbstractBizRequestDTO;
-import cn.com.taiji.managew.model.protocol.AbstractUcListRequest;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 
 /**
  * 卡券列表查询（状态为启用）
  *
  */
-public class CouponEnableListRequestDTO extends AbstractBizRequestDTO {
+public class CouponEnableListRequestDTO extends AbstractStaffBizRequestDTO {
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/CouponPageRequestDTO.java

@@ -1,8 +1,7 @@
 package cn.com.taiji.managew.dto.equity;
 
-import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO;
 import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
-import cn.com.taiji.managew.dto.AbstractBizPageRequestDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,7 +12,7 @@ import lombok.Data;
  * @Date 2024/03/13 013 11:48
  */
 @Data
-public class CouponPageRequestDTO extends AbstractBizPageRequestDTO {
+public class CouponPageRequestDTO extends AbstractStaffBizPageRequestDTO {
 
     @ApiModelProperty(value = "卡券权益所属渠道")
     private String couponAgencyType;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/RedisWrapManager.java

@@ -0,0 +1,70 @@
+package cn.com.taiji.managew.manager;
+
+import cn.com.taiji.common.manager.AbstractManager;
+import cn.com.taiji.core.manager.cache.RedisManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * hash操作的方法以hash开头，如：hashGet<br>
+ * 
+ * @author lijun <br>
+ *         Create Time：2018年12月9日 下午1:43:54<br>
+ *         mail:756915505@qq.com
+ * @since 1.0
+ * @version 1.0
+ */
+@Service
+public class RedisWrapManager extends AbstractManager implements RedisManager {
+
+    @Autowired(required = false)
+    private RedisTemplate<String, String> redisTemplate;
+
+    public Boolean expire(String key, final long timeout, final TimeUnit unit) {
+        return redisTemplate.expire(key, timeout, unit);
+    }
+
+    public Boolean hasKey(String key) {
+        return redisTemplate.hasKey(key);
+    }
+
+    public String get(String key) {
+        return redisTemplate.opsForValue().get(key);
+    }
+
+    public String getAndSet(String key, String value) {
+        return redisTemplate.opsForValue().getAndSet(key, value);
+    }
+
+    public void set(String key, String value, long timeout, TimeUnit unit) {
+        redisTemplate.opsForValue().set(key, value, timeout, unit);
+    }
+    /**
+     * 往redis中存入数据 默认为不过期
+     *
+     * @param key   key
+     * @param value value
+     */
+    public void setDefault(String key, String value) {
+        redisTemplate.opsForValue().set(key, value);
+    }
+
+    public boolean setIfAbsent(String key, String value, long timeout, TimeUnit unit) {
+        return redisTemplate.opsForValue().setIfAbsent(key, value, timeout, unit);
+    }
+
+    public Boolean delete(String key) {
+        return redisTemplate.delete(key);
+    }
+
+    private <HK, HV> HashOperations<String, HK, HV> opsForHash() {
+        return redisTemplate.opsForHash();
+    }
+
+    private void set(String key, String value, int timeout) {
+        redisTemplate.opsForValue().set(key, value, timeout, TimeUnit.SECONDS);
+    }
+}

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/equity/CouponManager.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.managew.manager.equity;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.core.entity.issue.IssueCouponInfo;
 import cn.com.taiji.managew.dto.equity.*;
@@ -14,9 +15,9 @@ import java.util.List;
  * @description: 卡券管理
  */
 public interface CouponManager {
-    void add(CouponAddRequestDTO req);
+    void add(CouponAddRequestDTO req) throws ServiceHandleException;
 
-    void edit(CouponEditRequestDTO req);
+    void edit(CouponEditRequestDTO req) throws ServiceHandleException;
 
     void delete(CouponDeleteRequestDTO req);
 

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/equity/CouponManagerImpl.java

@@ -1,10 +1,11 @@
 package cn.com.taiji.managew.manager.equity;
 
-import cn.com.taiji.common.manager.AbstractManager;
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.core.entity.issue.IssueCouponDetail;
 import cn.com.taiji.core.entity.issue.IssueCouponInfo;
+import cn.com.taiji.core.manager.cache.RedisCacheManager;
 import cn.com.taiji.core.manager.tools.minio.MinioUtile;
 import cn.com.taiji.core.repo.jpa.issue.IssueCouponDetailRepo;
 import cn.com.taiji.core.repo.jpa.issue.IssueCouponInfoRepo;
@@ -24,7 +25,8 @@ import java.util.List;
  * @description: 卡券管理
  */
 @Service
-public class CouponManagerImpl extends AbstractManager implements CouponManager{
+public class CouponManagerImpl extends RedisCacheManager implements CouponManager{
+
 
     @Autowired
     private IssueCouponInfoRepo issueCouponInfoRepo;
@@ -33,18 +35,18 @@ public class CouponManagerImpl extends AbstractManager implements CouponManager{
     @Autowired
     private MinioUtile minioUtile;
     @Override
-    public void add(CouponAddRequestDTO req) {
+    public void add(CouponAddRequestDTO req) throws ServiceHandleException {
         IssueCouponInfo couponInfo = copyProperties(req, new IssueCouponInfo());
-        couponInfo.setOperateOpenId(req.getOpenId());
+        couponInfo.setOperateOpenId(findOpenIdByToken(req.getAccessToken()));
         issueCouponInfoRepo.persist(couponInfo);
     }
 
     @Override
-    public void edit(CouponEditRequestDTO req) {
+    public void edit(CouponEditRequestDTO req) throws ServiceHandleException {
         IssueCouponInfo couponInfo = issueCouponInfoRepo.findById(req.getId()).orElse(null);
         if (couponInfo == null) throw new RuntimeException("卡券不存在");
         copyProperties(req, couponInfo);
-        couponInfo.setOperateOpenId(req.getOpenId());
+        couponInfo.setOperateOpenId(findOpenIdByToken(req.getAccessToken()));
         issueCouponInfoRepo.merge(couponInfo);
 
     }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/api/ServiceHallController.java

@@ -73,7 +73,7 @@ public class ServiceHallController extends MyValidController{
 
     @ApiOperation(value = "更新网点状态")
     @PostMapping(value = "/serviceHallDelete")
-    public ApiResponse serviceHallInsertDelete(@Valid @RequestBody ServiceHallDeleteRequestDTO reqDto) throws ManagerException {
+    public ApiResponse serviceHallInsertDelete(@Valid @RequestBody ServiceHallEnableRequestDTO reqDto) throws ManagerException {
         manager.updateState(reqDto);
         return ApiResponse.success().setMessage("状态更新成功");
     }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/agency/AgencyEnableRequestDTO.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.userw.dto.agency;
 
 import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
+import cn.com.taiji.core.entity.dict.basic.EnableFlag;
 import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
 import io.swagger.annotations.ApiModel;
 import lombok.Getter;
@@ -16,7 +17,6 @@ public class AgencyEnableRequestDTO extends AbstractStaffBizRequestDTO {
 
     @NotBlank(message = "渠道编号不能为空")
     private String agencyId;
-    @NotNull(message = "状态不能为空 1启用，0停用")
-    @IntegerConstant(values = "0,1", message = "状态错误")
-    private Integer status;
+    @NotNull(message = "状态不能为空")
+    private EnableFlag status;
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/serviceHall/ServiceHallEnableRequestDTO.java

@@ -0,0 +1,24 @@
+package cn.com.taiji.userw.dto.serviceHall;
+
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
+import cn.com.taiji.core.entity.dict.basic.EnableFlag;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ServiceHallEnableRequestDTO extends AbstractStaffBizRequestDTO {
+
+    @NotBlank(message = "网点编号不能为空")
+    @ApiModelProperty(value = "网点编号")
+    private String serviceHallId;
+
+    @NotNull
+    @ApiModelProperty(value = "状态")
+    private EnableFlag status;
+
+
+
+}

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/agency/AgencyManagerImpl.java

@@ -7,6 +7,7 @@ import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.core.entity.basic.QtkAgency;
 import cn.com.taiji.core.entity.basic.QtkAgencyMap;
 import cn.com.taiji.core.entity.basic.QtkAgencyModel;
+import cn.com.taiji.core.entity.dict.basic.EnableFlag;
 import cn.com.taiji.core.repo.jpa.basic.QtkAgencyMapRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkAgencyModelRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkAgencyRepo;
@@ -141,7 +142,7 @@ public class AgencyManagerImpl extends AbstractManager implements AgencyManager
         return sortAndFilter(qtkAgencyRepo.listByNameLike("%" + req.getName().trim() + "%"));
     }
     private List<StringKeyValue> sortAndFilter(List<QtkAgency> dbList) {
-        return dbList.stream().filter(a -> a.getStatus() == 1)
+        return dbList.stream().filter(a -> EnableFlag.ENABLE.equals(a.getStatus()))
                 .sorted(Comparator.comparing(QtkAgency::getName).thenComparing(QtkAgency::getAgencyId)).map(a->new StringKeyValue(a.getAgencyId(),a.getName())).collect(Collectors.toList());
     }
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/serviceHall/ServiceHallManager.java

@@ -25,7 +25,7 @@ public interface ServiceHallManager {
 
     void update(ServiceHallUpdateRequestDTO reqDto) throws ManagerException;
 
-    void updateState(ServiceHallDeleteRequestDTO reqDto) throws ManagerException;
+    void updateState(ServiceHallEnableRequestDTO reqDto) throws ManagerException;
 
     List<QtkServicehallLocation> queryLocations(ServiceHallDeleteRequestDTO reqDto);
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/serviceHall/ServiceHallManagerImpl.java

@@ -215,10 +215,10 @@ public class ServiceHallManagerImpl extends AbstractManager implements ServiceHa
     }
 
     @Override
-    public void updateState(ServiceHallDeleteRequestDTO reqDto) throws ManagerException {
+    public void updateState(ServiceHallEnableRequestDTO reqDto) throws ManagerException {
         Staff staff = staffRepo.findByStaffId(reqDto.getStaffId());
         if (staff == null) throw new ManagerException("员工不存在");
-        serviceHallRepo.updateState(0, LocalDateTime.now(), reqDto.getServiceHallId());
+        serviceHallRepo.updateState(reqDto.getStatus(), LocalDateTime.now(), reqDto.getServiceHallId());
     }
 
     @Override