ERP获取代采订单金额接口返回数据格式更新

src/main/java/com/uas/platform/b2b/publicapi/controller/TurnoverController.java

@@ -5,8 +5,6 @@ import com.uas.platform.b2b.publicapi.model.Turnover;
 import com.uas.platform.b2b.publicapi.service.TradeCountService;
 import com.uas.platform.b2b.publicapi.service.TurnoverService;
 import com.uas.platform.core.model.PageInfo;
-import org.apache.http.Consts;
-import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.util.CollectionUtils;
@@ -14,9 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
-import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -36,16 +32,14 @@ public class TurnoverController {
     @Autowired
     private TradeCountService tradeCountService;
 
-    private final static Logger logger = Logger.getLogger(TradeCountController.class);
-
     /**
      * 获取年度代采订单交易额
      *
-     * @return
+     * @return List<Turnover>
      */
     @RequestMapping(value = "/substitute", method = RequestMethod.GET)
-    public String findSubstitute() throws UnsupportedEncodingException {
-        return URLEncoder.encode(turnoverService.findSubstitute().toString(), Consts.UTF_8.toString());
+    public List<Turnover> findSubstitute() {
+        return turnoverService.findSubstitute();
     }
 
     /**
@@ -65,8 +59,8 @@ public class TurnoverController {
      *     @see Turnover
      */
     @RequestMapping(value = "/substitute/monthly", method = RequestMethod.GET)
-    public String findSubstituteMonthly() throws UnsupportedEncodingException {
-        return URLEncoder.encode(turnoverService.findSubstituteMonthly().toString(), Consts.UTF_8.toString());
+    public List<Turnover> findSubstituteMonthly() {
+        return turnoverService.findSubstituteMonthly();
     }
 
     /**