Просмотр исходного кода

修改bug:
私有应收,修改应收比例,开票时还显示修改前的应收

jiakai 3 месяцев назад
Родитель
Сommit
ecd48f0bf7

+ 5 - 0
tenant/organization/src/main/java/com/jzg/organization/mapper/ReceivableMapper.java

@@ -204,6 +204,11 @@ public interface ReceivableMapper extends BaseMapper<InsPlyIncome> {
      */
     Map<String, Object> getJqSumReceivable(@Param("orderNos") List<String> orderNos);
 
+    /**
+     * 获取应收交强的总金额
+     */
+    Map<String, Object> getIncomeJqSumReceivable(@Param("orderNos") List<String> orderNos);
+
     /**
      * 获取开票记录
      */

+ 4 - 1
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -763,8 +763,11 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                 .map(String::trim)
                 .distinct() // 可选,去重
                 .collect(Collectors.toList());
+        // 根据tz要求将从ins_fee_order查费用信息改为从income表查
+        Map<String, Object> map = baseMapper.getIncomeJqSumReceivable(orderNos);
+
         // 修改后(返回总手续费 = 交强险+商业险+驾意险 手续费之和)
-        Map<String, Object> map = baseMapper.getJqSumReceivable(orderNos);
+//        Map<String, Object> map = baseMapper.getJqSumReceivable(orderNos);
         if(map == null){
             // 订单不存在的时候,直接返回0
             log.info("订单不存在。 orderNos=[{}]", JSONUtil.toJsonStr(orderNos));

+ 19 - 0
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -1270,6 +1270,25 @@
         </where>
     </select>
 
+    <select id="getIncomeJqSumReceivable" resultType="java.util.Map">
+        SELECT
+        sum( jq_supervise_costs_premiums ) AS jqCommissionPremium,
+        sum( sy_supervise_costs_premiums ) AS syCommissionPremium,
+        sum( jy_supervise_costs_premiums ) AS jyCommissionPremium,
+        sum( jq_other_costs_premiums ) AS jqFollowPremium,
+        sum( sy_other_costs_premiums ) AS syFollowPremium,
+        sum( jy_other_costs_premiums ) AS jyFollowPremium
+        FROM
+        ins_ply_income
+        <where>
+            is_delete = 0
+            AND order_no IN
+            <foreach collection="orderNos" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </where>
+    </select>
+
     <select id="getInvoiceRecordList" resultType="com.jzg.commons.entity.finance.vo.InvoiceRecordResult">
         SELECT
         ipii.id,