From 302d38af2b7ccc39a03dfd216848ca107181ba76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 9 Sep 2025 11:09:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=90=88=E5=90=8C=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 2 +- .../com/cool/store/dao/ContractConfigDAO.java | 24 ++++++++ .../store/mapper/ContractConfigMapper.java | 2 + ...figMapper.xml => ContractConfigMapper.xml} | 13 +++- .../store/dto/contract/ContractConfigDTO.java | 1 - .../cool/store/entity/ContractConfigDO.java | 8 +++ .../store/service/ContractConfigService.java | 7 ++- .../impl/ContractConfigServiceImpl.java | 14 +++++ .../service/impl/LinePayServiceImpl.java | 3 - .../webb/ContractConfigController.java | 59 +++++++++++++++++++ 10 files changed, 126 insertions(+), 7 deletions(-) rename coolstore-partner-dao/src/main/resources/mapper/{contractConfigMapper.xml => ContractConfigMapper.xml} (80%) create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ContractConfigController.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 2b7cffb86..d48973587 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -304,10 +304,10 @@ public enum ErrorCodeEnum { NOT_FLAGSHIP_STORE_NOT_EXIST(16100006,"当前阶段加盟类型不能变更！",null), CURRENT_BRAND_SORT_NUMBER_EXIST(16100007,"当前品牌已存在该排序数字！",null), + CONTRACT_CONFIG_NOT_EXIST(16100008,"合同配置不存在！",null),; ; - protected static final Map map = Arrays.stream(values()).collect( Collectors.toMap(ErrorCodeEnum::getCode, Function.identity(), (a, b)->a)); private int code; diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ContractConfigDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ContractConfigDAO.java index 07e0b3c25..9db56f10b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ContractConfigDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ContractConfigDAO.java @@ -18,6 +18,11 @@ public class ContractConfigDAO { @Resource private ContractConfigMapper contractConfigMapper; + + public ContractConfigDO queryContractConfigById(Long id){ + return contractConfigMapper.selectByPrimaryKey(id); + } + public int addContractConfig(ContractConfigDO contractConfigDO){ return contractConfigMapper.insertSelective(contractConfigDO); } @@ -37,7 +42,26 @@ public class ContractConfigDAO { } + /** + * 合同配置列表 + * @param brand + * @return + */ public List queryContractConfigList(String brand) { return contractConfigMapper.queryContractConfigList(brand); } + + /** + * 根据加盟品牌与加盟模式 查出所有的未删除状态的合并合同 + * @param brand + * @param mode + * @return + */ + public List queryContractConfigListByBrandAndMode(String brand,String mode) { + return contractConfigMapper.queryContractConfigListByBrandAndMode(brand,mode); + } + + public void deleteContractConfig(Long id) { + contractConfigMapper.deleteByPrimaryKey(id); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ContractConfigMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ContractConfigMapper.java index 7fffb9113..b02e05d34 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ContractConfigMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ContractConfigMapper.java @@ -13,4 +13,6 @@ public interface ContractConfigMapper extends Mapper { List queryContractConfigList(String brand); + + List queryContractConfigListByBrandAndMode(String brand, String mode); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/contractConfigMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ContractConfigMapper.xml similarity index 80% rename from coolstore-partner-dao/src/main/resources/mapper/contractConfigMapper.xml rename to coolstore-partner-dao/src/main/resources/mapper/ContractConfigMapper.xml index cfc76f2de..fd81efa35 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/contractConfigMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ContractConfigMapper.xml @@ -14,7 +14,7 @@ - + @@ -31,4 +31,15 @@ and brand = #{brand} + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/contract/ContractConfigDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/contract/ContractConfigDTO.java index d6d3a926c..6e9d92519 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/contract/ContractConfigDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/contract/ContractConfigDTO.java @@ -32,7 +32,6 @@ public class ContractConfigDTO { private String partyA; @ApiModelProperty("乙方名称") - @NotBlank(message = "乙方名称不能为空") private String partyB; @ApiModelProperty(" 丙方名称") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/ContractConfigDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/ContractConfigDO.java index 519722000..ef2c84d4c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/ContractConfigDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/ContractConfigDO.java @@ -89,6 +89,14 @@ public class ContractConfigDO { this.payeeName = payeeName; } + public Integer getDeleted() { + return deleted; + } + + public void setDeleted(Integer deleted) { + this.deleted = deleted; + } + /** * 获取主键ID * diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ContractConfigService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ContractConfigService.java index d2b46961c..7bcb7fdef 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ContractConfigService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ContractConfigService.java @@ -37,7 +37,12 @@ public interface ContractConfigService { PageInfo queryContractConfigList(QueryContractListDTO queryContractListDTO); - + /** + * 删除配置 + * @param id + * @return + */ + Boolean deleteContractConfig(Long id); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContractConfigServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContractConfigServiceImpl.java index 606010d1a..5cafb54eb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContractConfigServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContractConfigServiceImpl.java @@ -8,6 +8,7 @@ import com.cool.store.entity.ContractConfigDO; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.service.ContractConfigService; +import com.cool.store.utils.poi.constant.Constants; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; @@ -57,6 +58,7 @@ public class ContractConfigServiceImpl implements ContractConfigService { String modelStr = addContractConfigDTO.getFranchiseModeList().stream().collect(Collectors.joining(",")); contractConfigDO.setFranchiseMode("," + modelStr + ","); } + contractConfigDAO.updateContractConfig(contractConfigDO); return Boolean.TRUE; } @@ -78,5 +80,17 @@ public class ContractConfigServiceImpl implements ContractConfigService { return contractConfigDOPageInfo; } + @Override + public Boolean deleteContractConfig(Long id) { + ContractConfigDO contractConfigDO = contractConfigDAO.queryContractConfigById(id); + if (contractConfigDO == null){ + throw new ServiceException(ErrorCodeEnum.CONTRACT_CONFIG_NOT_EXIST); + } + contractConfigDO.setDeleted(Constants.ONE_INTEGER); + //修改配置状态 + contractConfigDAO.updateContractConfig(contractConfigDO); + return Boolean.TRUE; + } + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java index d1be25aea..5f00aa80f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java @@ -32,20 +32,17 @@ import com.cool.store.service.UserAuthMappingService; import com.cool.store.utils.CoolDateUtils; import com.cool.store.utils.RedisConstantUtil; import com.cool.store.utils.RedisUtilPool; -import com.cool.store.utils.UUIDUtils; import com.cool.store.utils.poi.DateUtils; import com.cool.store.utils.poi.StringUtils; import com.cool.store.utils.poi.constant.Constants; import com.cool.store.vo.LinePayVO; import com.cool.store.vo.PartnerUserInfoVO; -import jdk.nashorn.internal.codegen.types.BooleanType; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; import java.math.BigDecimal; diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ContractConfigController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ContractConfigController.java new file mode 100644 index 000000000..7580972d2 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ContractConfigController.java @@ -0,0 +1,59 @@ +package com.cool.store.controller.webb; + +import com.cool.store.dto.contract.ContractConfigDTO; +import com.cool.store.dto.contract.ContractListDTO; +import com.cool.store.dto.contract.QueryContractListDTO; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.ContractConfigService; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.xml.ws.Response; + +/** + * @Author suzhuhong + * @Date 2025/9/9 10:03 + * @Version 1.0 + */ +@RestController +@RequestMapping("pc/contract") +@Api(tags = "PC-合同配置") +@Slf4j +public class ContractConfigController { + + + @Resource + private ContractConfigService contractConfigService; + + @PostMapping("/addContractConfig") + @ApiOperation("添加合同配置") + public ResponseResult addContractConfig(@RequestBody @Validated ContractConfigDTO addContractConfigDTO) { + return ResponseResult.success(contractConfigService.addContractConfig(addContractConfigDTO)); + } + + @PostMapping("/updateContractConfig") + @ApiOperation("更新合同配置") + public ResponseResult updateContractConfig(@RequestBody @Validated ContractConfigDTO addContractConfigDTO) { + return ResponseResult.success(contractConfigService.updateContractConfig(addContractConfigDTO)); + } + + @PostMapping("/queryContractConfigList") + @ApiOperation("合同配置列表") + public ResponseResult> queryContractConfigList(@RequestBody QueryContractListDTO queryContractListDTO) { + return ResponseResult.success(contractConfigService.queryContractConfigList(queryContractListDTO)); + } + + @GetMapping("/deleteContractConfig") + @ApiOperation("删除配置") + public ResponseResult deleteContractConfig(Long id) { + return ResponseResult.success(contractConfigService.deleteContractConfig(id)); + } + + +}