Authored by wujiexiang

Merge branch 'hotfix-PlatformServiceFee' into test6.9.22

1 package com.yohoufo.order.service.support; 1 package com.yohoufo.order.service.support;
2 2
3 -import com.yoho.core.common.utils.DateUtil; 3 +import com.yohoufo.common.utils.DateUtil;
4 import com.yohobuy.ufo.model.order.common.EntrySellerType; 4 import com.yohobuy.ufo.model.order.common.EntrySellerType;
5 import com.yohobuy.ufo.model.order.constants.OrderConstant; 5 import com.yohobuy.ufo.model.order.constants.OrderConstant;
6 import com.yohobuy.ufo.model.order.constants.SkupType; 6 import com.yohobuy.ufo.model.order.constants.SkupType;
@@ -13,6 +13,8 @@ import org.junit.Assert; @@ -13,6 +13,8 @@ import org.junit.Assert;
13 import org.junit.Test; 13 import org.junit.Test;
14 import org.springframework.beans.factory.annotation.Autowired; 14 import org.springframework.beans.factory.annotation.Autowired;
15 15
  16 +import java.math.BigDecimal;
  17 +
16 /** 18 /**
17 * 卖家订单统计 19 * 卖家订单统计
18 */ 20 */
@@ -50,4 +52,11 @@ public class SellerOrderQuantityStatsTest extends BaseWebTest { @@ -50,4 +52,11 @@ public class SellerOrderQuantityStatsTest extends BaseWebTest {
50 //0.05 最大比例 52 //0.05 最大比例
51 Assert.assertTrue(sellerPlatformServiceFee.getFeeRate().doubleValue() < 0.05); 53 Assert.assertTrue(sellerPlatformServiceFee.getFeeRate().doubleValue() < 0.05);
52 } 54 }
  55 +
  56 + @Test
  57 + public void test_currentPeriod_feeRate_is_null_for_advance() {
  58 + BigDecimal feeRate = sellerPlatformServiceFeeSupport.getPlatformServiceFeeRate(uid, SkupType.ADVANCE);
  59 + Assert.assertTrue(feeRate == null);
  60 +
  61 + }
53 } 62 }