费用修改bug

src/main/java/com/ydtech/modules/fnc/service/impl/InsFeeAuditServiceImpl.java

@@ -205,25 +205,25 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 }
 
                 //交强手续费出口比例
-                BigDecimal jqExportProceduresFee = insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getJqSuperviseCostsProportion().divide(new BigDecimal(100)));
+                BigDecimal jqExportProceduresFee = insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getJqSuperviseCostsProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
                 //交强跟单出口费用
                 BigDecimal jqExportOtherFee = insFeeOrderNew.getJqPremium()
                         .multiply(jqExportProceduresProportion
-                                .subtract(insFeeOrderNew.getJqSuperviseCostsProportion()).divide(new BigDecimal(100)));
+                                .subtract(insFeeOrderNew.getJqSuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
 
                 //商业手续费出口比例
-                BigDecimal syExportProceduresFee = insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSySuperviseCostsProportion().divide(new BigDecimal(100)));
+                BigDecimal syExportProceduresFee = insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSySuperviseCostsProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
                 //商业跟单出口比例
                 BigDecimal syExportOtherFee = insFeeOrderNew.getSyPremium()
                         .multiply(syExportProceduresProportion
-                                .subtract(insFeeOrderNew.getSySuperviseCostsProportion()).divide(new BigDecimal(100)));
+                                .subtract(insFeeOrderNew.getSySuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
 
                 //非车手续费出口比例
-                BigDecimal noExportProceduresFee = insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getNoSuperviseCostsProportion().divide(new BigDecimal(100)));
+                BigDecimal noExportProceduresFee = insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getNoSuperviseCostsProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
                 //非车跟单出口比例
                 BigDecimal noExportOtherFee = insFeeOrderNew.getNoPremium()
                         .multiply(noExportProceduresProportion
-                                .subtract(insFeeOrderNew.getNoSuperviseCostsProportion()).divide(new BigDecimal(100)));
+                                .subtract(insFeeOrderNew.getNoSuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
 
                 //用户出口手续费
                 BigDecimal totalPremiumAmount = new BigDecimal(0);

src/main/java/com/ydtech/modules/order/dao/InsAreaCompanyMapper.java

@@ -51,6 +51,7 @@ public interface InsAreaCompanyMapper extends BaseMapper<InsAreaCompany> {
      */
     Page<InsOrders> getPendingAuditOrders(Page page, @Param("params") OrderQueryVo orderQueryVo);
 
+    Page<InsOrders> getAlreadyAuditOrders(Page page, @Param("params") OrderQueryVo orderQueryVo);
 }
 
 

src/main/java/com/ydtech/modules/order/service/InsAreaCompanyService.java

@@ -78,5 +78,12 @@ public interface InsAreaCompanyService extends IService<InsAreaCompany> {
      */
     Page<InsOrders> getPendingAuditOrders(Page page, OrderQueryVo orderQueryVo);
 
+    /**
+     * 查询已审核得订单
+     * @param page
+     * @param orderQueryVo
+     * @return
+     */
+    Page<InsOrders> getAlreadyAuditOrders(Page page, OrderQueryVo orderQueryVo);
 
 }

src/main/java/com/ydtech/modules/order/service/impl/InsAreaCompanyServiceImpl.java

@@ -107,6 +107,11 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         return baseMapper.getPendingAuditOrders(page,orderQueryVo);
     }
 
+    @Override
+    public Page<InsOrders> getAlreadyAuditOrders(Page page, OrderQueryVo orderQueryVo) {
+        return baseMapper.getAlreadyAuditOrders(page,orderQueryVo);
+    }
+
 }
 
 

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -350,11 +350,20 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
         }
         Page<InsAreaCompany> page = PageRequest.buildPageRequest(orderQueryVo.getPageRequest());
-        Page<InsOrders> pendingAuditOrders = insAreaCompanyService.getPendingAuditOrders(page,orderQueryVo);
 
-        return new BasePageResult<>(pendingAuditOrders.getCurrent(), page.getSize(), pendingAuditOrders.getTotal(),
-                pendingAuditOrders.getPages(),
-                pendingAuditOrders.getRecords());
+        Page<InsOrders> resultOrders = new Page<>();
+
+        //查询未审核
+        if(orderQueryVo.getAuditStatus().equals("0")){
+            resultOrders = insAreaCompanyService.getPendingAuditOrders(page, orderQueryVo);
+        }else if(orderQueryVo.getAuditStatus().equals("1")){
+            //已审核
+            resultOrders = insAreaCompanyService.getAlreadyAuditOrders(page,orderQueryVo);
+        }
+
+        return new BasePageResult<>(resultOrders.getCurrent(), page.getSize(), resultOrders.getTotal(),
+                resultOrders.getPages(),
+                resultOrders.getRecords());
     }
 
 //    @Override

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -134,26 +134,29 @@
 
     <select id="getPendingAuditOrders" resultType="com.ydtech.modules.order.entity.InsOrders">
         SELECT
-            *
+        *
         FROM
-            ins_orders
+        ins_orders
         WHERE
-            orderno IN (
-            SELECT
-                orderno
-            FROM
-                ins_area_company
-            WHERE
-                    id IN ( SELECT ins_order_no FROM ins_fee_order_new WHERE ins_order_no IN ( SELECT id FROM ins_area_company WHERE orderstatus = 2 OR orderstatus = 3 ) UNION SELECT ins_order_no FROM ins_fee_audit )
+        orderno IN (
+        SELECT
+        orderno
+        FROM
+        ins_area_company
+        WHERE
+        id IN ( SELECT ins_order_no FROM ins_fee_order_new WHERE id NOT IN ( SELECT ins_order_no FROM ins_fee_audit ) )
+        AND orderstatus = 2
         )
+        AND
+        orderstatus= 2
         <if test="params.orderNo != null and params.orderNo != ''">
             AND orderno = #{params.orderNo}
         </if>
         <if test="params.licenseNo != null and params.licenseNo != ''">
-            AND license_no = #{params.licenseNo}
+            AND licenseno = #{params.licenseNo}
         </if>
         <if test="params.frameNo != null and params.frameNo != ''">
-            AND frame_no = #{params.frameNo}
+            AND frameno = #{params.frameNo}
         </if>
         <if test="params.insuredname != null and params.insuredname != ''">
             AND insuredname = #{params.insuredname}
@@ -163,4 +166,36 @@
         </if>
     </select>
 
+
+    <select id="getAlreadyAuditOrders" resultType="com.ydtech.modules.order.entity.InsOrders">
+        SELECT
+        *
+        FROM
+        ins_orders
+        WHERE
+        orderno IN (
+        SELECT
+        orderno
+        FROM
+        ins_area_company
+        WHERE
+        id IN ( SELECT ifon.ins_order_no FROM ins_fee_order_new ifon RIGHT JOIN ins_fee_audit ifa ON ifon.ins_order_no = ifa.ins_order_no ))
+          AND
+            orderstatus = 2
+        <if test="params.orderNo != null and params.orderNo != ''">
+            AND orderno = #{params.orderNo}
+        </if>
+        <if test="params.licenseNo != null and params.licenseNo != ''">
+            AND licenseno = #{params.licenseNo}
+        </if>
+        <if test="params.frameNo != null and params.frameNo != ''">
+            AND frameno = #{params.frameNo}
+        </if>
+        <if test="params.insuredname != null and params.insuredname != ''">
+            AND insuredname = #{params.insuredname}
+        </if>
+        <if test="params.startDate != null and params.startDate != ''">
+            BETWEEN createtime = #{params.startDate} and #{params.endDate}
+        </if>
+    </select>
 </mapper>