Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/uas/platform/b2b/ps/ProductUtils.java

@@ -398,13 +398,13 @@ public class ProductUtils {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            if (HttpStatus.OK.value() == res.getStatusCode()) {
+            if (null != res && HttpStatus.OK.value() == res.getStatusCode()) {
                 List<ProductInfo> productInfoList = JSONObject.parseArray(res.getResponseText(), ProductInfo.class);
                 for (ProductInfo productInfo : productInfoList) {
                     resultMap.put(productInfo.getCode(), productInfo);
                 }
             } else {
-                logger.error("findByEnUUAndCodes http response status error: " + res.getStatusCode());
+                logger.error("findByEnUUAndCodes http response status error: " + res != null ? res.getStatusCode() : "access error");
             }
         }
         return resultMap;

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

@@ -1,12 +1,19 @@
 package com.uas.platform.b2b.publicapi.controller;
 
+import com.uas.platform.b2b.publicapi.model.TradeCount;
 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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -21,6 +28,9 @@ public class TurnoverController {
     @Autowired
     private TurnoverService turnoverService;
 
+    @Autowired
+    private TradeCountService tradeCountService;
+
     /**
      * 获取年度代采订单交易额
      *
@@ -48,7 +58,23 @@ public class TurnoverController {
      */
     @RequestMapping(value = "/orderAmount/RMB", method = RequestMethod.GET)
     public List<Turnover> findRMBOrderAmount() {
-        return turnoverService.findRMBOrderAmount();
+        PageInfo pageInfo = new PageInfo();
+        pageInfo.setPageNumber(1);
+        pageInfo.setPageSize(20);
+        pageInfo.setSort(new Sort(Sort.Direction.DESC, "id"));
+        String tradeType = "thisYearTrade";
+        String currency = "RMB";
+        // 为了保证商城、ERP取数一致，调用一个接口的数据
+        List<TradeCount> counts = tradeCountService.findByParameters(tradeType, currency, null, null, pageInfo);
+        Turnover turnover = new Turnover();
+        // erp需要处理
+        BigDecimal multiplier = new BigDecimal("0.0001");
+        BigDecimal sum = !CollectionUtils.isEmpty(counts) ?
+                counts.get(0).getAmount().multiply(multiplier).setScale(2, BigDecimal.ROUND_HALF_UP) : new BigDecimal(0);
+        turnover.setSum(sum);
+        List<Turnover> turnovers = new ArrayList<>();
+        turnovers.add(turnover);
+        return turnovers;
     }
 
     /**