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

Merge branch 'cc20250207_optimize_v2.5' into cc_20250211_v2.6

Browse Source
This commit is contained in:
shuo.wang
2025-02-17 15:32:16 +08:00
parent 50a7700fdf 82d90774ab
commit 3588919fcc
10 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java
View File

@@ -14,4 +14,6 @@ public interface FranchiseFeeMapper extends Mapper<FranchiseFeeDO> {
FranchiseFeeDO selectByShopId(@Param("shopId") Long shopId);
List<FranchiseFeeDTO> getPayTimeByShopIds(@Param("shopIds") List<Long> shopIds);
Integer updateDataHandleServiceV25();
}

5
coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml
View File

@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cool.store.mapper.FranchiseFeeMapper">
<update id="updateDataHandleServiceV25">
update xfsg_franchise_fee
set first_year_fee = "6000",
first_year_manage_fee = "7200"
</update>
<select id="selectByShopId" resultType="com.cool.store.entity.FranchiseFeeDO">
select *

2
coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java
View File

@@ -33,6 +33,8 @@ public class FranchiseFeeDO {
private Date firstYearEndTime;
@Column(name = "first_year_fee")
private String firstYearFee;
@Column(name = "first_year_manage_fee")
private String firstYearManageFee;
@Column(name = "second_year_start_time")
private Date secondYearStartTime;
@Column(name = "second_year_end_time")

5
coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseFeeRequest.java
View File

@@ -23,8 +23,10 @@ public class FranchiseFeeRequest {
private Date firstYearStartTime;
@ApiModelProperty("第一年度结束时间")
private Date firstYearEndTime;
@ApiModelProperty("第一年度加盟费")
@ApiModelProperty("第一年度品牌使用费")
private String firstYearFee;
@ApiModelProperty("第一年度管理费")
private String firstYearManageFee;
@ApiModelProperty("第二年度开始时间")
private Date secondYearStartTime;
@ApiModelProperty("第二年度结束时间")
@@ -50,6 +52,7 @@ public class FranchiseFeeRequest {
franchiseFeeDO.setFirstYearStartTime(this.firstYearStartTime);
franchiseFeeDO.setFirstYearEndTime(this.firstYearEndTime);
franchiseFeeDO.setFirstYearFee(this.firstYearFee);
franchiseFeeDO.setFirstYearManageFee(this.firstYearManageFee);
franchiseFeeDO.setSecondYearStartTime(this.secondYearStartTime);
franchiseFeeDO.setSecondYearEndTime(this.secondYearEndTime);
franchiseFeeDO.setSecondYearFee(this.secondYearFee);

5
coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java
View File

@@ -23,8 +23,10 @@ public class FranchiseFeeResponse {
private Date firstYearStartTime;
@ApiModelProperty("第一年度结束时间")
private Date firstYearEndTime;
@ApiModelProperty("第一年度加盟费")
@ApiModelProperty("第一年度品牌使用费")
private String firstYearFee;
@ApiModelProperty("第一年度管理费")
private String firstYearManageFee;
@ApiModelProperty("第二年度开始时间")
private Date secondYearStartTime;
@ApiModelProperty("第二年度结束时间")
@@ -174,6 +176,7 @@ public class FranchiseFeeResponse {
franchiseFeeResponse.setPerformanceBond(franchiseFeeDO.getPerformanceBond());
franchiseFeeResponse.setCreateTime(franchiseFeeDO.getCreateTime());
franchiseFeeResponse.setUpdateTime(franchiseFeeDO.getUpdateTime());
franchiseFeeResponse.setFirstYearManageFee(franchiseFeeDO.getFirstYearManageFee());
return franchiseFeeResponse;
}
}

5
coolstore-partner-service/src/main/java/com/cool/store/service/DataHandleService.java
View File

@@ -15,6 +15,11 @@ public interface DataHandleService {
*/
Boolean dataHandleService(Long shopId);
/**
* v2.5 数据处理
* @return
*/
Integer dataHandleServiceV25();
}

10
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandleServiceImpl.java
View File

@@ -9,6 +9,7 @@ import com.cool.store.entity.ShopStageInfoDO;
import com.cool.store.enums.point.ShopStageEnum;
import com.cool.store.enums.point.ShopSubStageEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.mapper.FranchiseFeeMapper;
import com.cool.store.service.DataHandleService;
import com.cool.store.utils.poi.DateUtils;
import org.apache.commons.collections4.CollectionUtils;
@@ -34,7 +35,8 @@ public class DataHandleServiceImpl implements DataHandleService {
ShopInfoDAO shopInfoDAO;
@Resource
ShopStageInfoDAO shopStageInfoDAO;
@Resource
FranchiseFeeMapper franchiseFeeMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -76,6 +78,12 @@ public class DataHandleServiceImpl implements DataHandleService {
return Boolean.TRUE;
}
@Override
public Integer dataHandleServiceV25() {
return franchiseFeeMapper.updateDataHandleServiceV25();
}
public void licenseHandle(ShopStageInfoDO shopStageInfoDO){
if (Objects.isNull(shopStageInfoDO)){

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java
View File

@@ -98,7 +98,7 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService {
LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(linePayDO.getLineId());
linePayResult.setPartnerName(lineInfoDO.getUsername());
}
linePayResult.setAmount(new BigInteger(result.getPerformanceBond()).add(new BigInteger(result.getFirstYearFee()))
linePayResult.setAmount(new BigInteger(result.getPerformanceBond()).add(new BigInteger(result.getFirstYearFee())).add(new BigInteger(result.getFirstYearManageFee()))
.add(new BigInteger(result.getYearFranchiseFee())).add(new BigInteger(result.getLoanMargin())).toString());
if (Objects.nonNull(result.getAuditId())) {
ShopAuditInfoDO shopAuditInfoDO = shopAuditInfoMapper.selectByPrimaryKey(result.getAuditId());

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PosAndOrderInfoServiceImpl.java
View File

@@ -87,6 +87,7 @@ public class PosAndOrderInfoServiceImpl implements PosAndOrderInfoService {
throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE);
}
shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_244);
preparationService.updateShopStatus(shopId);
return Boolean.TRUE;
}
}

4
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
View File

@@ -96,6 +96,10 @@ public class PCTestController {
return ResponseResult.success(dataHandleService.dataHandleService(shopId));
}
@GetMapping("/dataHandleServiceV25")
public ResponseResult<Integer> dataHandleServiceV25(){
return ResponseResult.success(dataHandleService.dataHandleServiceV25());
}
@GetMapping("/licenseSync")
public ResponseResult<Boolean> licenseSync(){