feat:合同配置

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<Integer, ErrorCodeEnum> map = Arrays.stream(values()).collect(
             Collectors.toMap(ErrorCodeEnum::getCode, Function.identity(), (a, b)->a));
     private int code;

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<ContractConfigDO> queryContractConfigList(String brand) {
         return contractConfigMapper.queryContractConfigList(brand);
     }
+
+    /**
+     * 根据加盟品牌与加盟模式 查出所有的未删除状态的合并合同
+     * @param brand
+     * @param mode
+     * @return
+     */
+    public List<ContractConfigDO> queryContractConfigListByBrandAndMode(String brand,String mode) {
+        return contractConfigMapper.queryContractConfigListByBrandAndMode(brand,mode);
+    }
+
+    public void deleteContractConfig(Long id) {
+        contractConfigMapper.deleteByPrimaryKey(id);
+    }
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/ContractConfigMapper.java

@@ -13,4 +13,6 @@ public interface ContractConfigMapper extends Mapper<ContractConfigDO> {
 
 
     List<ContractConfigDO> queryContractConfigList(String brand);
+
+    List<ContractConfigDO> queryContractConfigListByBrandAndMode(String brand, String mode);
 }

coolstore-partner-dao/src/main/resources/mapper/ContractConfigMapper.xml

@@ -14,7 +14,7 @@
     <result column="franchise_mode" jdbcType="VARCHAR" property="franchiseMode" />
     <result column="fadada_template_id" jdbcType="VARCHAR" property="fadadaTemplateId" />
     <result column="serial_number" jdbcType="INTEGER" property="serialNumber" />
-    <result column="payee_name" javaType="VARCHAR" property="payeeName"/>
+    <result column="payee_name" jdbcType="VARCHAR" property="payeeName"/>
     <result column="deleted" jdbcType="TINYINT" property="deleted" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -31,4 +31,15 @@
       and brand = #{brand}
     </if>
   </select>
+
+  <select id="queryContractConfigListByBrandAndMode" resultMap="BaseResultMap">
+    select * from xfsg_contract_config
+    where deleted = 0
+    <if test="brand!=null and brand !=''">
+      and brand = #{brand}
+    </if>
+    <if test="mode!=null and mode !=''">
+      and franchise_mode like concat('%,',#{mode},',%')
+    </if>
+  </select>
 </mapper>

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(" 丙方名称")

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
      *

coolstore-partner-service/src/main/java/com/cool/store/service/ContractConfigService.java

@@ -37,7 +37,12 @@ public interface ContractConfigService {
      PageInfo<ContractListDTO> queryContractConfigList(QueryContractListDTO queryContractListDTO);
 
 
-
+    /**
+     * 删除配置
+     * @param id
+     * @return
+     */
+     Boolean deleteContractConfig(Long id);
 
 
 }

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;
+    }
+
 
 }

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;

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<Boolean> addContractConfig(@RequestBody @Validated ContractConfigDTO addContractConfigDTO) {
+        return ResponseResult.success(contractConfigService.addContractConfig(addContractConfigDTO));
+    }
+
+    @PostMapping("/updateContractConfig")
+    @ApiOperation("更新合同配置")
+    public ResponseResult<Boolean> updateContractConfig(@RequestBody @Validated ContractConfigDTO addContractConfigDTO) {
+        return ResponseResult.success(contractConfigService.updateContractConfig(addContractConfigDTO));
+    }
+
+    @PostMapping("/queryContractConfigList")
+    @ApiOperation("合同配置列表")
+    public ResponseResult<PageInfo<ContractListDTO>> queryContractConfigList(@RequestBody QueryContractListDTO queryContractListDTO) {
+        return ResponseResult.success(contractConfigService.queryContractConfigList(queryContractListDTO));
+    }
+
+    @GetMapping("/deleteContractConfig")
+    @ApiOperation("删除配置")
+    public ResponseResult<Boolean> deleteContractConfig(Long id) {
+        return ResponseResult.success(contractConfigService.deleteContractConfig(id));
+    }
+
+
+}