You've already forked FrameTour-BE
refactor(scenic): 替换ScenicConfigEntity为ScenicConfigManager
- 将所有使用ScenicConfigEntity的地方替换为ScenicConfigManager - 更新获取景区配置的方法调用 - 修改属性访问方式为通过manager的getter方法 - 移除已废弃的ScenicConfigEntity类及相关方法 - 统一配置读取接口,提高代码一致性与可维护性
This commit is contained in:
@@ -7,7 +7,7 @@ import com.ycwl.basic.mapper.StatisticsMapper;
|
||||
import com.ycwl.basic.model.pc.broker.entity.BrokerRecord;
|
||||
import com.ycwl.basic.model.pc.broker.resp.BrokerRespVO;
|
||||
import com.ycwl.basic.model.pc.order.entity.OrderEntity;
|
||||
import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity;
|
||||
import com.ycwl.basic.integration.common.manager.ScenicConfigManager;
|
||||
import com.ycwl.basic.repository.OrderRepository;
|
||||
import com.ycwl.basic.repository.ScenicRepository;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -43,14 +43,14 @@ public class BrokerBiz {
|
||||
log.info("订单不存在,订单ID:{}", orderId);
|
||||
return;
|
||||
}
|
||||
ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(order.getScenicId());
|
||||
ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(order.getScenicId());
|
||||
if (scenicConfig == null) {
|
||||
log.info("景区不存在,订单ID:{}", orderId);
|
||||
return;
|
||||
}
|
||||
int expireDay = 3;
|
||||
if (scenicConfig.getSampleStoreDay() != null) {
|
||||
expireDay = scenicConfig.getSampleStoreDay();
|
||||
if (scenicConfig.getInteger("sample_store_day") != null) {
|
||||
expireDay = scenicConfig.getInteger("sample_store_day");
|
||||
}
|
||||
List<Long> brokerIdList = statisticsMapper.getBrokerIdListForUser(order.getMemberId(), DateUtil.offsetDay(DateUtil.beginOfDay(order.getCreateAt()), -expireDay), order.getCreateAt());
|
||||
if (brokerIdList == null || brokerIdList.isEmpty()) {
|
||||
@@ -103,7 +103,7 @@ public class BrokerBiz {
|
||||
BigDecimal realRate = broker.getBrokerRate();
|
||||
BigDecimal brokerPrice = order.getPayPrice().multiply(realRate).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN);
|
||||
// todo 需要计算实际提成比例
|
||||
BigDecimal firstRate = scenicConfig.getBrokerDirectRate();
|
||||
BigDecimal firstRate = scenicConfig.getBigDecimal("broker_direct_rate");
|
||||
if (firstRate == null) {
|
||||
firstRate = BigDecimal.ZERO;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user