suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:合同配置

Browse Source
This commit is contained in:
苏竹红
2025-09-09 11:09:57 +08:00
parent 83ddafb842
commit 302d38af2b
10 changed files with 126 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

14
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContractConfigServiceImpl.java
View File

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

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
View File

@@ -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;