优化划扣推送凭证

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
 import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApply;
 import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyVo;
 import com.yxt.anrui.riskcenter.api.loancustomerrecord.LoanCustomerRecord;
@@ -14,6 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -25,4 +27,6 @@ public interface LoanBuckleApplyMapper extends BaseMapper<LoanBuckleApply> {
     int updateFlowFiled(Map<String, Object> map);
 
     int selectNum(String bill);
+
+    List<FinUncollectedReceivablesDetailedJR> selFinJrList(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyMapper.xml

@@ -40,4 +40,15 @@
         from loan_buckle_apply
         where billNo LIKE concat(#{bill}, '%')
     </select>
-</mapper>
+    <select id="selFinJrList"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR">
+        SELECT
+            *
+        FROM
+            anrui_fin.fin_uncollected_receivables_detailed_jr
+        WHERE
+            busSid = #{sid}
+          AND payCostTitleValue = '资方退还垫款'
+          AND reveivableMoney > 0
+    </select>
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java

@@ -18,6 +18,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDe
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
@@ -800,9 +801,9 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                             voucherDetail.setSceneCode("01");
                         }
                     } else if (oweState == 0) {
-                        BigDecimal paymentMoney = planDetails.getPaymentMoney();
-                        if (null != paymentMoney) {
-                            if (paymentMoney.compareTo(BigDecimal.ZERO) > 0) {
+                        List<FinUncollectedReceivablesDetailedJR> jrList = baseMapper.selFinJrList(planDetails.getSid());
+                        if (null != jrList) {
+                            if (jrList.size() > 0) {
                                 voucherDetail.setSceneCode("03");
                             } else {
                                 voucherDetail.setSceneCode("02");