Authored by tanling

Merge branch 'test6.8.4' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.4

@@ -13,7 +13,8 @@ import java.util.regex.Pattern; @@ -13,7 +13,8 @@ import java.util.regex.Pattern;
13 * Created by chunhua.zhang@yoho.cn on 2015/12/15. 13 * Created by chunhua.zhang@yoho.cn on 2015/12/15.
14 */ 14 */
15 public class BigDecimalHelper { 15 public class BigDecimalHelper {
16 - public static final String FORMAT_TWOBITAFTERPOINT = "##0.00"; 16 + public static final String FORMAT_TWOBITAFTERPOINT = "##0.00",
  17 + FORMAT_NOPOINT = "##0";
17 18
18 private static Map<String,DecimalFormat> DecimalFormatCache = new HashMap<>(); 19 private static Map<String,DecimalFormat> DecimalFormatCache = new HashMap<>();
19 20
@@ -95,7 +96,7 @@ public class BigDecimalHelper { @@ -95,7 +96,7 @@ public class BigDecimalHelper {
95 } 96 }
96 97
97 public static void main(String[] args) { 98 public static void main(String[] args) {
98 - 99 + System.out.println(formatNumber(new BigDecimal(111123.0011D), FORMAT_NOPOINT));
99 System.out.println(isDigitalNumber("11111")); 100 System.out.println(isDigitalNumber("11111"));
100 System.out.println(isDigitalNumber("1111.00")); 101 System.out.println(isDigitalNumber("1111.00"));
101 System.out.println(isDigitalNumber("1111.0")); 102 System.out.println(isDigitalNumber("1111.0"));
@@ -4,6 +4,7 @@ import com.yohobuy.ufo.model.order.bo.ButtonShowBo; @@ -4,6 +4,7 @@ import com.yohobuy.ufo.model.order.bo.ButtonShowBo;
4 import com.yohobuy.ufo.model.order.common.ButtonShow; 4 import com.yohobuy.ufo.model.order.common.ButtonShow;
5 import com.yohobuy.ufo.model.order.common.SellerType; 5 import com.yohobuy.ufo.model.order.common.SellerType;
6 import com.yohobuy.ufo.model.order.common.SkupStatus; 6 import com.yohobuy.ufo.model.order.common.SkupStatus;
  7 +import com.yohoufo.common.utils.BigDecimalHelper;
7 import com.yohoufo.order.common.Payment; 8 import com.yohoufo.order.common.Payment;
8 import com.yohoufo.order.service.proxy.ProductProxyService; 9 import com.yohoufo.order.service.proxy.ProductProxyService;
9 import com.yohoufo.product.response.StorageDataResp; 10 import com.yohoufo.product.response.StorageDataResp;
@@ -88,7 +89,7 @@ public interface AbsSellerOrderViewService { @@ -88,7 +89,7 @@ public interface AbsSellerOrderViewService {
88 } 89 }
89 90
90 default String buildLeastPriceTips(BigDecimal leastPrice){ 91 default String buildLeastPriceTips(BigDecimal leastPrice){
91 - return "当前尺码最低售价¥" + leastPrice.toPlainString(); 92 + return "该尺码最低售价¥" + BigDecimalHelper.formatNumber(leastPrice, BigDecimalHelper.FORMAT_NOPOINT);
92 } 93 }
93 94
94 95