新增租赁订单gmv

src/main/java/com/mmc/oms/dao/lease/LeaseOrderDao.java

@@ -9,6 +9,7 @@ import com.mmc.oms.entity.uav.UavOrderRemarkDO;
 import com.mmc.oms.model.qo.uav.UavOrderQO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -53,4 +54,8 @@ public interface LeaseOrderDao {
     void updateLeaseOrderRemarkStatus(Integer id);
 
     void addRemarkOrder(UavOrderRemarkDO uavOrderRemarkDO);
+
+    int getLeaseOrderCount();
+
+    BigDecimal getLeaseOrderGMV();
 }

src/main/java/com/mmc/oms/service/data/impl/OrderReportServiceImpl.java

 package com.mmc.oms.service.data.impl;
 
 import com.mmc.oms.common.result.ResultBody;
+import com.mmc.oms.dao.lease.LeaseOrderDao;
 import com.mmc.oms.dao.uav.UavOrderDao;
 import com.mmc.oms.feign.ImsAppApi;
 import com.mmc.oms.model.dto.data.OrderReportDTO;
@@ -22,6 +23,8 @@ public class OrderReportServiceImpl implements OrderReportService {
     private UavOrderDao uavOrderDao;
     @Resource
     private ImsAppApi imsAppApi;
+    @Resource
+    private LeaseOrderDao leaseOrderDao;
 
     @Override
     public ResultBody<OrderReportDTO> getOrderReportData() {
@@ -29,8 +32,8 @@ public class OrderReportServiceImpl implements OrderReportService {
         // 获取商城订单数量
         int saleOrderCount = uavOrderDao.getOrderCount();
         orderReportDTO.setSaleOrderCount(saleOrderCount);
-        // 获取租赁订单数量// todo 暂时默认0
-        int leaseOrderCount = 0;
+        // 获取租赁订单数量
+        int leaseOrderCount = leaseOrderDao.getLeaseOrderCount();
         orderReportDTO.setLeaseOrderCount(leaseOrderCount);
         // 获取服务订单总数
         ResultBody<ReleaseReportDTO> userReportData = imsAppApi.getUserReportData();
@@ -39,8 +42,8 @@ public class OrderReportServiceImpl implements OrderReportService {
         // 获取商城订单GMV
         BigDecimal saleGMV = uavOrderDao.getSaleOrderGMV();
         orderReportDTO.setSaleGMV(saleGMV);
-        // 获取租赁订单GMV // todo 暂时默认0
-        BigDecimal leaseGMV = BigDecimal.ZERO;
+        // 获取租赁订单GMV
+        BigDecimal leaseGMV = leaseOrderDao.getLeaseOrderGMV();
         orderReportDTO.setLeaseGMV(leaseGMV);
         BigDecimal serviceGMV = userReportData.getResult().getServiceOrderAmount();
         orderReportDTO.setServiceGMV(serviceGMV);

src/main/resources/mapper/lease/LeaseOrderDao.xml

@@ -250,4 +250,14 @@ share_cash_pledge,salary_cash_pledge,other_pledge
         from lease_refund_order
         where lease_order_id = #{id} and type = #{type}
     </select>
+    <select id="getLeaseOrderCount" resultType="java.lang.Integer">
+        select count(*)
+        from lease_order
+        where status_code <![CDATA[<>]]> 999
+    </select>
+    <select id="getLeaseOrderGMV" resultType="java.math.BigDecimal">
+        SELECT sum(order_total_amount) AS GMV
+        FROM lease_order
+        WHERE status_code <![CDATA[<>]]> 999
+    </select>
 </mapper>
\ No newline at end of file