ufo / yohoufo-fore · Commits

Go to a project

Authored by wujiexiang
Commit a7ea4e6690311570478c3a41ceb5ef59fc0b57fb 2 parents de74c429 f31941ea

Merge branch 'hotfix-PlatformServiceFee' into test6.9.22

Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
@@ -102,7 +102,7 @@ public class SellerPlatformServiceFeeSupport { @@ -102,7 +102,7 @@ public class SellerPlatformServiceFeeSupport {
102 SellerOrderStatsEntry currentStatsEntry = SellerOrderStatsEntry.builder() 102 SellerOrderStatsEntry currentStatsEntry = SellerOrderStatsEntry.builder()
103 .sellerUid(uid) 103 .sellerUid(uid)
104 .skupType(skupType) 104 .skupType(skupType)
105 - .time(com.yohoufo.common.utils.DateUtil.getCurrentTimeSecond()) 105 + .time(DateUtil.getCurrentTimeSecond())
106 .bidType(OrderConstant.NON_LIMIT_BID_TYPE) 106 .bidType(OrderConstant.NON_LIMIT_BID_TYPE)
107 .build(); 107 .build();
108 SellerOrderStatsConfiguration currentStatsConfig = statsConfigurationManager.getStatsConfig(currentStatsEntry); 108 SellerOrderStatsConfiguration currentStatsConfig = statsConfigurationManager.getStatsConfig(currentStatsEntry);
@@ -110,6 +110,7 @@ public class SellerPlatformServiceFeeSupport { @@ -110,6 +110,7 @@ public class SellerPlatformServiceFeeSupport {
110 if (currentStatsConfig != SellerOrderStatsConfiguration.emptyConfiguration) { 110 if (currentStatsConfig != SellerOrderStatsConfiguration.emptyConfiguration) {
111 SellerOrderStatsResult statsResult = (SellerOrderStatsResult) statsConfigurationManager.getStatsProcessor(currentStatsConfig.getStatsProcessorName()).getResult(currentStatsEntry, currentStatsConfig); 111 SellerOrderStatsResult statsResult = (SellerOrderStatsResult) statsConfigurationManager.getStatsProcessor(currentStatsConfig.getStatsProcessorName()).getResult(currentStatsEntry, currentStatsConfig);
112 if (Objects.isNull(statsResult)) { 112 if (Objects.isNull(statsResult)) {
  113 + //满足规则，但没有统计记录，按0件处理
113 statsResult = createEmptyStatsResult(uid, currentStatsConfig.getStatsCode()); 114 statsResult = createEmptyStatsResult(uid, currentStatsConfig.getStatsCode());
114 } 115 }
115 //3.最终费率 116 //3.最终费率