Merge remote-tracking branch 'origin/dev_fifo' into lh_dev_fifo

src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java

@@ -271,15 +271,22 @@ public class IoOrderDetailResultController extends BaseController {
         List<IoOrderDetailResultResponse> list = orderDetailResultService.filterOrderList(orderDetailResultRequest);
 
         for (IoOrderDetailResultResponse orderDetailResultResponse : list) {
+            BigDecimal totalPrice = BigDecimal.ZERO;
+            BigDecimal price = orderDetailResultResponse.getPrice();
+            int reCount = orderDetailResultResponse.getReCount();
+            if (price != null){
+                totalPrice = price.multiply(BigDecimal.valueOf(reCount));
+            }
             if (orderDetailResultResponse.getMainAction().equals(ConstantType.TYPE_OUT)) {
-                orderDetailResultResponse.setOutCount(orderDetailResultResponse.getReCount());
+                orderDetailResultResponse.setOutCount(reCount);
                 orderDetailResultResponse.setInCount(0);
             } else {
                 orderDetailResultResponse.setOutCount(0);
-                orderDetailResultResponse.setInCount(orderDetailResultResponse.getReCount());
+                orderDetailResultResponse.setInCount(reCount);
             }
             String fromName = orderDetailResultResponse.getFromName();
             orderDetailResultResponse.setFromName(fromName);
+            orderDetailResultResponse.setSumPrice(totalPrice);
         }
         return list;
     }

src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java

@@ -233,4 +233,10 @@ public class IoOrderDetailResultResponse {
     }
 
 
+
+    /**
+     * 价格
+     */
+    private BigDecimal sumPrice;
+
 }

src/main/java/com/glxp/api/task/ScanThrOrderGenerateOrderTask.java

@@ -47,13 +47,13 @@ public class ScanThrOrderGenerateOrderTask implements SchedulingConfigurer {
 
     private void process() {
 //=======================================================================================
-//        log.info("定时扫描三方的明细表-收费明细类型开开始");
+        log.info("定时扫描三方的明细表-收费明细类型开开始");
-//        try {
+        try {
-//            thrInvOrderService.scanInvSfOrderGenerateSfOrder();
+            thrInvOrderService.scanInvSfOrderGenerateSfOrder();
-//        } catch (Exception e) {
+        } catch (Exception e) {
-//            log.error(ExceptionUtils.getStackTrace(e));
+            log.error(ExceptionUtils.getStackTrace(e));
-//        }
+        }
-//        log.info("定时扫描三方的明细表-收费明细类型结束");
+        log.info("定时扫描三方的明细表-收费明细类型结束");
 //=======================================================================================
         log.info("定时扫描三方的明细表-普耗明细类型开开始");
         try {