From e919ed18ead772d428c48c87b6be3a68d7611b23 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 7 Feb 2025 17:41:37 +0800 Subject: [PATCH 1/5] v2.5 --- .../java/com/cool/store/mapper/FranchiseFeeMapper.java | 2 ++ .../src/main/resources/mapper/FranchiseFeeMapper.xml | 5 +++++ .../java/com/cool/store/entity/FranchiseFeeDO.java | 2 ++ .../com/cool/store/request/FranchiseFeeRequest.java | 5 ++++- .../com/cool/store/response/FranchiseFeeResponse.java | 4 +++- .../java/com/cool/store/service/DataHandleService.java | 5 +++++ .../cool/store/service/impl/DataHandleServiceImpl.java | 10 +++++++++- .../store/service/impl/FranchiseFeeServiceImpl.java | 2 +- .../cool/store/controller/webb/PCTestController.java | 4 ++++ 9 files changed, 35 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java index 168ef8396..f682d7e30 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java @@ -7,4 +7,6 @@ import tk.mybatis.mapper.common.Mapper; public interface FranchiseFeeMapper extends Mapper { FranchiseFeeDO selectByShopId(@Param("shopId") Long shopId); + Integer updateDataHandleServiceV25(); + } diff --git a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml index f5df125cd..70631337c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml @@ -1,6 +1,11 @@ + + update xfsg_franchise_fee + set first_year_fee = "7200", + first_year_manage_fee = "6000" + select * diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java index 31fe07899..bfb5f9ac6 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java @@ -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") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseFeeRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseFeeRequest.java index 2af633294..6e72e5e8c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseFeeRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseFeeRequest.java @@ -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); diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java index 616d4039c..78e415b38 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java @@ -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("第二年度结束时间") diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandleService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandleService.java index f40d79de5..e1b61573d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandleService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandleService.java @@ -15,6 +15,11 @@ public interface DataHandleService { */ Boolean dataHandleService(Long shopId); + /** + * v2.5 数据处理 + * @return + */ + Integer dataHandleServiceV25(); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandleServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandleServiceImpl.java index 731237efc..9ecc03b46 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandleServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandleServiceImpl.java @@ -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)){ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java index ca66971ca..af71c8f0d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java @@ -97,7 +97,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()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java index 878d5557f..57cc64f6f 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java @@ -95,6 +95,10 @@ public class PCTestController { return ResponseResult.success(dataHandleService.dataHandleService(shopId)); } + @GetMapping("/dataHandleServiceV25") + public ResponseResult dataHandleServiceV25(){ + return ResponseResult.success(dataHandleService.dataHandleServiceV25()); + } @GetMapping("/licenseSync") public ResponseResult licenseSync(){ From 1dd385513cd0e7080dbd35dff7cc1e73baab2608 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 13 Feb 2025 20:57:01 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix=20=E9=97=A8=E5=BA=97=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/PosAndOrderInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PosAndOrderInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PosAndOrderInfoServiceImpl.java index 236e9c111..8cb48812f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PosAndOrderInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PosAndOrderInfoServiceImpl.java @@ -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; } } From 1d088e41fbeaf7a6c09ced82efd2879624f7c8d2 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 14 Feb 2025 14:24:14 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix=20=E6=9F=A5=E8=AF=A2=E5=8A=A0=E7=9B=9F?= =?UTF-8?q?=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/response/FranchiseFeeResponse.java | 1 + 1 file changed, 1 insertion(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java index 78e415b38..bc3bde51c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java @@ -173,6 +173,7 @@ public class FranchiseFeeResponse { franchiseFeeResponse.setPerformanceBond(franchiseFeeDO.getPerformanceBond()); franchiseFeeResponse.setCreateTime(franchiseFeeDO.getCreateTime()); franchiseFeeResponse.setUpdateTime(franchiseFeeDO.getUpdateTime()); + franchiseFeeResponse.setFirstYearManageFee(franchiseFeeDO.getFirstYearManageFee()); return franchiseFeeResponse; } } From 82d90774ab453166d23aeb27cc00b55460aab724 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 17 Feb 2025 11:11:29 +0800 Subject: [PATCH 5/5] =?UTF-8?q?add=20=E4=BC=81=E5=BE=AE=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/FranchiseFeeMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml index d6d3d145a..e7f4d8cef 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml @@ -3,8 +3,8 @@ update xfsg_franchise_fee - set first_year_fee = "7200", - first_year_manage_fee = "6000" + set first_year_fee = "6000", + first_year_manage_fee = "7200"