修复电视大屏问题

superdesk-uniorder-dto/src/main/java/cn/superdesk/uniorder/dto/vo/_dashboard/TvHeadDataVo.java

@@ -1,11 +1,6 @@
 package cn.superdesk.uniorder.dto.vo._dashboard;
 
-import cn.superdesk.uniorder.common.json.deserializer.BigDecimalScale2ConvertDeserializer;
-import cn.superdesk.uniorder.common.json.serializer.BigDecimalScale2ConvertSerializer;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -58,53 +53,53 @@ public class TvHeadDataVo implements Serializable {
 	private Long orderCount;
 
 	@ApiModelProperty("订单维度统计 销售金额")
-	@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
-	@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
+	//@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
+	//@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
 	private BigDecimal orderAmountSumIf;
 	@ApiModelProperty("订单维度统计 销售金额")
-	@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
-	@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
+	//@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
+	//@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
 	private BigDecimal orderAmount;
 	@ApiModelProperty("订单维度统计 成本金额")
-	@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
-	@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
+	//@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
+	//@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
 	private BigDecimal orderCostAmount;
 
 	@ApiModelProperty("订单维度统计 运费")
-	@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
-	@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
+	//@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
+	//@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
 	private BigDecimal orderTransportAmount;
 
 	@ApiModelProperty("订单维度统计 退单销售金额")
-	@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
-	@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
+	//@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
+	//@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
 	private BigDecimal orderRefundAmount;
 	@ApiModelProperty("订单维度统计 退单成本金额")
-	@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
-	@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
+	//@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
+	//@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
 	private BigDecimal orderRefundCostAmount;
 
 	@ApiModelProperty("商品维度统计 销售销售金额")
-	@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
-	@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
+	//@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
+	//@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
 	private BigDecimal goodsAmount;
 	@ApiModelProperty("商品维度统计 销售成本金额")
-	@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
-	@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
+	//@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
+	//@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
 	private BigDecimal goodsCostAmount;
 
 	@ApiModelProperty("商品维度统计 运费")
-	@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
-	@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
+	//@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
+	//@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
 	private BigDecimal goodsTransportAmount;
 
 	@ApiModelProperty("商品维度统计 退货销售金额")
-	@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
-	@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
+	//@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
+	//@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
 	private BigDecimal goodsRefundAmount;
 	@ApiModelProperty("商品维度统计 退货成本金额")
-	@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
-	@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
+	//@JsonDeserialize(using = BigDecimalScale2ConvertDeserializer.class)
+	//@JsonSerialize(using = BigDecimalScale2ConvertSerializer.class)
 	private BigDecimal goodsRefundCostAmount;
 
 	/****************************************** 添加两个冗余的 start ******************************************/

superdesk-uniorder-web/src/main/java/cn/superdesk/uniorder/dubbo/consumer/_dashboard/TvDashboardDubboConsumerService.java

@@ -25,7 +25,7 @@ import java.util.List;
 @Component
 public class TvDashboardDubboConsumerService {
 
-	@Reference(version = "1.0.0", timeout = 30000, retries = -1)
+	@Reference(version = "1.0.0", timeout = 3000000, retries = -1)
 	private DubboTvDashboardService dubboTvDashboardService;