优化入驻流程
This commit is contained in:
parent
9c153abaf5
commit
8e6ff03395
@ -696,16 +696,11 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 查询入驻记录
|
// 查询入驻记录
|
||||||
// QueryWrapper<ShopMchEntry> queryWrapper = new QueryWrapper<>();
|
|
||||||
// queryWrapper.eq("id", mchId);
|
|
||||||
// ShopMchEntry record = findOne(queryWrapper);
|
|
||||||
ShopMchEntry record = get(mchId);
|
ShopMchEntry record = get(mchId);
|
||||||
if (record == null) {
|
if (record == null) {
|
||||||
return CommonResult.failed("商家入驻记录不存在!");
|
return CommonResult.failed("商家入驻记录不存在!");
|
||||||
}
|
}
|
||||||
|
|
||||||
// log.debug("###提交拉卡拉前,更新的记录 {}###", JSONUtil.toJsonStr(record));
|
|
||||||
|
|
||||||
// 自动计算商家分成比例
|
// 自动计算商家分成比例
|
||||||
BigDecimal splitRatio = shopBaseStoreCategoryService.getStoreCategoryRatio(record.getBiz_category());
|
BigDecimal splitRatio = shopBaseStoreCategoryService.getStoreCategoryRatio(record.getBiz_category());
|
||||||
if (splitRatio == null || splitRatio.compareTo(BigDecimal.ZERO) <= 0) {
|
if (splitRatio == null || splitRatio.compareTo(BigDecimal.ZERO) <= 0) {
|
||||||
@ -740,8 +735,11 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
|
|||||||
|
|
||||||
// 转换拉卡拉的日期格式 yyyy-MM-dd
|
// 转换拉卡拉的日期格式 yyyy-MM-dd
|
||||||
record = convLklDateFormat(record);
|
record = convLklDateFormat(record);
|
||||||
|
if (record.getSettlement_method() == null
|
||||||
// log.debug("###提交拉卡拉时,更新的记录 {}###", JSONUtil.toJsonStr(record));
|
|| record.getSettlement_method() < 0
|
||||||
|
|| record.getSettlement_method() > 1) {
|
||||||
|
record.setSettlement_method(0); // 结算类型:0-秒到;1-次日结算
|
||||||
|
}
|
||||||
|
|
||||||
// 执行更新操作
|
// 执行更新操作
|
||||||
if (!updateById(record)) {
|
if (!updateById(record)) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user