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

Merge #90 into master from cc_20260407_bzj

Browse Source 
feat：时间处理

* cc_20260407_bzj: (3 commits squashed)

  - feat：新增设备费用

  - feat：分账

  - feat：时间处理

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/90
This commit is contained in:
正新
2026-04-08 11:41:54 +00:00
parent 68cef4b83a
commit 77ca18b6fc
13 changed files with 121 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -246,7 +246,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(request.getShopId());
PointInfoDO pointInfoById = pointInfoDAO.getPointInfoById(shopInfoDO.getPointId());
FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectByShopId(request.getShopId());
if (franchiseFeeDO!=null&&franchiseFeeDO.getFirstYearStartTime()==null&&franchiseFeeDO.getFirstYearEndTime()==null){
if (franchiseFeeDO!=null){
franchiseFeeDO.setFirstYearStartTime(request.getFirstYearStartTime());
franchiseFeeDO.setFirstYearEndTime(request.getFirstYearEndTime());
franchiseFeeMapper.updateByPrimaryKeySelective(franchiseFeeDO);
@@ -362,6 +362,12 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
verifyParams(request);
ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(request.getShopId());
PointInfoDO pointInfoById = pointInfoDAO.getPointInfoById(shopInfoDO.getPointId());
FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectByShopId(request.getShopId());
if (franchiseFeeDO!=null){
franchiseFeeDO.setFirstYearStartTime(request.getFirstYearStartTime());
franchiseFeeDO.setFirstYearEndTime(request.getFirstYearEndTime());
franchiseFeeMapper.updateByPrimaryKeySelective(franchiseFeeDO);
}
SignFranchiseDO signFranchiseDO = request.toSignFranchiseDO();
//修改信息
signFranchiseMapper.updateByPrimaryKeySelective(signFranchiseDO);

29
coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java
View File

@@ -287,14 +287,16 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService {
.add(safe(storeType.getSystemUsageFee()))
.add(safe(storeType.getDesignFee()))
.add(safe(storeType.getFirstOrderFee()))
.add(safe(storeType.getContractDeposit()));
.add(safe(storeType.getContractDeposit()))
.add(safe(storeType.getDeviceDeposit()));
BigDecimal originalStoreFixedAmount = safe(storeType.getOriginalFranchiseFee())
.add(safe(storeType.getOriginalBrandUsageFee()))
.add(safe(storeType.getOriginalManagementFee()))
.add(safe(storeType.getOriginalSystemUsageFee()))
.add(safe(storeType.getOriginalDesignFee()))
.add(safe(storeType.getOriginalContractDeposit()));
.add(safe(storeType.getOriginalContractDeposit()))
.add(safe(storeType.getOriginalDeviceDeposit()));
BigDecimal totalAmount = storeFixedAmount.add(optionAmount);
@@ -322,6 +324,8 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService {
.originalSystemUsageFee(safe(storeType.getOriginalSystemUsageFee()))
.contractDeposit(safe(storeType.getContractDeposit()))
.originalContractDeposit(safe(storeType.getOriginalContractDeposit()))
.deviceDeposit(safe(storeType.getDeviceDeposit()))
.originalDeviceDeposit(safe(storeType.getOriginalDeviceDeposit()))
.designFee(safe(storeType.getDesignFee()))
.originalDesignFee(safe(storeType.getOriginalDesignFee()))
.firstOrderFee(safe(storeType.getFirstOrderFee()))
@@ -411,6 +415,7 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService {
feeInfo.setSystemUsageFee(order.getSystemUsageFee());
feeInfo.setDesignFee(order.getDesignFee());
feeInfo.setContractDeposit(order.getContractDeposit());
feeInfo.setDeviceDeposit(order.getDeviceDeposit());
feeInfo.setFirstOrderFee(order.getFirstOrderFee());
feeInfo.setStoreFixedAmount(order.getStoreFixedAmount());
vo.setFeeInfo(feeInfo);
@@ -798,7 +803,8 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService {
.add(safe(storeType.getSystemUsageFee()))
.add(safe(storeType.getDesignFee()))
.add(safe(storeType.getFirstOrderFee()))
.add(safe(storeType.getContractDeposit()));
.add(safe(storeType.getContractDeposit()))
.add(safe(storeType.getDeviceDeposit()));
BigDecimal originalStoreFixedAmount = safe(storeType.getOriginalFranchiseFee())
@@ -806,7 +812,8 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService {
.add(safe(storeType.getOriginalManagementFee()))
.add(safe(storeType.getOriginalSystemUsageFee()))
.add(safe(storeType.getOriginalDesignFee()))
.add(safe(storeType.getOriginalContractDeposit()));
.add(safe(storeType.getOriginalContractDeposit()))
.add(safe(storeType.getOriginalDeviceDeposit()));
BigDecimal totalAmount = storeFixedAmount.add(optionAmount);
@@ -830,6 +837,8 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService {
.originalSystemUsageFee(safe(storeType.getOriginalSystemUsageFee()))
.contractDeposit(safe(storeType.getContractDeposit()))
.originalContractDeposit(safe(storeType.getOriginalContractDeposit()))
.deviceDeposit(safe(storeType.getDeviceDeposit()))
.originalDeviceDeposit(safe(storeType.getOriginalDeviceDeposit()))
.designFee(safe(storeType.getDesignFee()))
.originalDesignFee(safe(storeType.getOriginalDesignFee()))
.firstOrderFee(safe(storeType.getFirstOrderFee()))
@@ -1324,7 +1333,8 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService {
.add(safe(storeType.getSystemUsageFee()))
.add(safe(storeType.getDesignFee()))
.add(safe(storeType.getFirstOrderFee()))
.add(safe(storeType.getContractDeposit()));
.add(safe(storeType.getContractDeposit()))
.add(safe(storeType.getDeviceDeposit()));
BigDecimal originalStoreFixedAmount = safe(storeType.getOriginalFranchiseFee())
@@ -1332,7 +1342,8 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService {
.add(safe(storeType.getOriginalManagementFee()))
.add(safe(storeType.getOriginalSystemUsageFee()))
.add(safe(storeType.getOriginalDesignFee()))
.add(safe(storeType.getOriginalContractDeposit()));
.add(safe(storeType.getOriginalContractDeposit()))
.add(safe(storeType.getOriginalDeviceDeposit()));
BigDecimal totalAmount = storeFixedAmount.add(optionAmount);
@@ -1356,6 +1367,8 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService {
.originalSystemUsageFee(safe(storeType.getOriginalSystemUsageFee()))
.contractDeposit(safe(storeType.getContractDeposit()))
.originalContractDeposit(safe(storeType.getOriginalContractDeposit()))
.deviceDeposit(safe(storeType.getDeviceDeposit()))
.originalDeviceDeposit(safe(storeType.getOriginalDeviceDeposit()))
.designFee(safe(storeType.getDesignFee()))
.originalDesignFee(safe(storeType.getOriginalDesignFee()))
.firstOrderFee(safe(storeType.getFirstOrderFee()))
@@ -1523,7 +1536,8 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService {
.add(safe(storeType.getSystemUsageFee()))
.add(safe(storeType.getDesignFee()))
.add(safe(storeType.getFirstOrderFee()))
.add(safe(storeType.getContractDeposit()));
.add(safe(storeType.getContractDeposit()))
.add(safe(storeType.getDeviceDeposit()));
for (MiniStoreWishlistSaveRequest.SelectedOption selected : request.getSelectedOptions()) {
if (selected == null || selected.getOptionId() == null || selected.getQuantity() == null
@@ -1886,6 +1900,7 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService {
feeInfo.setSystemUsageFee(storeTypeDO.getSystemUsageFee());
feeInfo.setDesignFee(storeTypeDO.getDesignFee());
feeInfo.setContractDeposit(storeTypeDO.getContractDeposit());
feeInfo.setDeviceDeposit(storeTypeDO.getDeviceDeposit());
feeInfo.setFirstOrderFee(storeTypeDO.getFirstOrderFee());
vo.setFeeInfoVO(feeInfo);
vo.setStoreTypeName(storeTypeDO.getStoreTypeName());

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

@@ -663,6 +663,9 @@ public class PreAllocationRecordServiceImpl implements PreAllocationRecordServic
if (WalletFeeItemEnum.EARNEST_MONEY.getExpenseType().equals(expenseType)) {
return storeOrder.getContractDeposit();
}
if (WalletFeeItemEnum.DEVICE_EARNEST_MONEY.getExpenseType().equals(expenseType)) {
return storeOrder.getDeviceDeposit();
}
return BigDecimal.ZERO;
}