Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/OrderInfoController.java

@@ -53,7 +53,7 @@ public class OrderInfoController {
     }
 
     /**
-     * 查询订单集合
+     * 获取一个月内司机的订单
      *
      * @param
      * @return
@@ -63,6 +63,18 @@ public class OrderInfoController {
         return orderInfoService.selectOrderInfoList();
     }
 
+
+    /**
+     * 查询订单集合
+     *
+     * @param
+     * @return
+     */
+    @GetMapping("/getData")
+    List<OrderInfo> getData(String commonId) {
+        return orderInfoService.getData(commonId);
+    }
+
     /**
      * 订单详情
      */

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -604,6 +604,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         freightInfo.setPrepaidFreight(orderInfo1.getAdvanceCharge());
                         freightInfo.setPrepaidFreightDate(df.parse(Time));
                         freightInfo.setNopayableFreight(freightInfo.getPayableFreight() - freightInfo.getPayabledFreight());
+                        freightInfo.setReceivableFreight(orderInfo1.getAdvanceCharge()+freightInfo.getOwnerServiceCharge());
+                        freightInfo.setReceivabledFreight(orderInfo1.getAdvanceCharge());
                         if (orderInfo1.getCompId() != null && !orderInfo1.getCompId().isEmpty()) {
                             //货主是公司
                             HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo1.getCompId());
@@ -688,6 +690,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         freightInfo.setNopayableFreight(freightInfo.getPayableFreight() - freightInfo.getPayabledFreight());
                         freightInfo.setFreightBalance(freightInfo.getPayableFreight() - freightInfo.getPrepaidFreight());
                         freightInfo.setFreightBalanceDate(df.parse(Time));
+                        Double d = freightInfo.getReceivableFreight();
+                        freightInfo.setReceivableFreight(d+freightInfo.getFreightBalance());
+                        freightInfo.setReceivabledFreight(freightInfo.getReceivableFreight());
                         freightInfo.setTotalCollection(freightInfo.getPayableFreight());
                         if (orderInfo1.getCompId() != null && !orderInfo1.getCompId().isEmpty()) {
                             //货主是公司
@@ -738,8 +743,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         if (hyDriverInfo != null) {
                             Long count = hyDriverInfo.getShipmentsNumber() + 1;
                             hyDriverInfo.setShipmentsNumber(count);
-                            Double d = hyDriverInfo.getAccumulatedFreight();
-                            hyDriverInfo.setAccumulatedFreight(d+freightInfo.getActualFreight()-freightInfo.getDriverServiceCharge());
+                            Double d2 = hyDriverInfo.getAccumulatedFreight();
+                            hyDriverInfo.setAccumulatedFreight(d2+freightInfo.getActualFreight()-freightInfo.getDriverServiceCharge());
                             driverInfoService.updateById(hyDriverInfo);
                         }
                         //货主发运次数+1,计算累计支付运费
@@ -748,8 +753,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         if (hyCargoOwnerInfo != null) {
                             Long count = hyCargoOwnerInfo.getShipmentsNumber() + 1;
                             hyCargoOwnerInfo.setShipmentsNumber(count);
-                            Double d = hyCargoOwnerInfo.getAccumulatedFreight();
-                            hyCargoOwnerInfo.setAccumulatedFreight(d+freightInfo.getActualFreight()+freightInfo.getOwnerServiceCharge());
+                            Double d3 = hyCargoOwnerInfo.getAccumulatedFreight();
+                            hyCargoOwnerInfo.setAccumulatedFreight(d3+freightInfo.getActualFreight()+freightInfo.getOwnerServiceCharge());
                             cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
                         }
                     }

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/DriverCarInfoMapper.xml

@@ -78,9 +78,9 @@
         case when c.delete_flag = '1' then '已删除' else c.status end as status,
         c.create_date as createDate,
         c.update_date as updateDate
-        FROM hy_driver_info d
-        left join hy_driver_car_info c on d.id=c.driver_id
-        WHERE d.delete_flag = '0'
+        FROM hy_driver_car_info c
+        left join hy_driver_info d on d.id=c.driver_id and d.delete_flag = '0'
+        WHERE c.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
                 AND c.status_key = '1'