backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商家比例 完善

Browse Source
This commit is contained in:
Jack 2025-10-28 00:27:32 +08:00
parent 3e9688f21d
commit 97441ca887
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java
View File

@ -928,8 +928,6 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
return CommonResult.failed("商家入驻记录不存在！"); return CommonResult.failed("商家入驻记录不存在！");
} }
// 分账比例，最终提交给拉卡拉的分账比例是 20%。
BigDecimal splitRatio = getMchEntryRatioOrDefault(shopMchEntry.getBiz_category(), shopMchEntry.getBiz_second_category(), shopMchEntry.getSplit_ratio(), new BigDecimal(94));
// 如果是驳回状态，直接返回成功消息 // 如果是驳回状态，直接返回成功消息
if (approvalStatus.equals(CommonConstant.MCH_APPR_STA_NOPASS)) { if (approvalStatus.equals(CommonConstant.MCH_APPR_STA_NOPASS)) {
@ -955,7 +953,13 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
shopMchEntry.setApproval_invalid_col(approvalInvalidCol); shopMchEntry.setApproval_invalid_col(approvalInvalidCol);
shopMchEntry.setUpdated_by(userId); shopMchEntry.setUpdated_by(userId);
shopMchEntry.setSettlement_method(1); // 结算类型：0-秒到（不分账）；1-次日结算（需要分账） shopMchEntry.setSettlement_method(1); // 结算类型：0-秒到（不分账）；1-次日结算（需要分账）
shopMchEntry.setSplit_ratio(splitRatio); // 分账比例，最终提交给拉卡拉的分账比例是 20%。
BigDecimal splitRatio = shopMchEntry.getSplit_ratio();
if (CheckUtil.isEmpty(splitRatio)) {
splitRatio = getMchEntryRatioOrDefault(shopMchEntry.getBiz_category(), shopMchEntry.getBiz_second_category(), shopMchEntry.getSplit_ratio(), new BigDecimal(94));
shopMchEntry.setSplit_ratio(splitRatio);
}
// 店铺省市区处理 // 店铺省市区处理
String[] result = handleStoreDistrictInfo(shopMchEntry.getStore_district(), shopMchEntry.getStore_area(), shopMchEntry.getStore_address()); String[] result = handleStoreDistrictInfo(shopMchEntry.getStore_district(), shopMchEntry.getStore_area(), shopMchEntry.getStore_address());

15
mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
View File

@ -3206,12 +3206,15 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
CheckUtil.isNotEmpty(shopMchEntry.getBiz_second_category()) ? shopMchEntry.getBiz_second_category() : 0); CheckUtil.isNotEmpty(shopMchEntry.getBiz_second_category()) ? shopMchEntry.getBiz_second_category() : 0);
} }
// 计算分账比例 BigDecimal splitRatio = shopMchEntry.getSplit_ratio();
BigDecimal splitRatio = shopMchEntryService.getMchEntryRatioOrDefault( if (CheckUtil.isEmpty(splitRatio)) {
shopMchEntry.getBiz_category(), // 计算分账比例
shopMchEntry.getBiz_second_category(), splitRatio = shopMchEntryService.getMchEntryRatioOrDefault(
shopMchEntry.getSplit_ratio(), shopMchEntry.getBiz_category(),
new BigDecimal(94)); shopMchEntry.getBiz_second_category(),
shopMchEntry.getSplit_ratio(),
new BigDecimal(94));
}
if (CheckUtil.isEmpty(shopStoreBase.getSplit_ratio())) { if (CheckUtil.isEmpty(shopStoreBase.getSplit_ratio())) {
shopStoreBase.setSplit_ratio(splitRatio); shopStoreBase.setSplit_ratio(splitRatio);