Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@@ -431,7 +431,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                         if (null != resultBean.getData()) {
                             CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
                             creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
-                            if (null != solutions) {
+                            /*if (null != solutions) {
                                 if (StringUtils.isNotBlank(loanOtherReceivablePush.getIsCompInvoic())) {
                                     if (loanOtherReceivablePush.getIsCompInvoic().equals("1")) {
                                         //挂车待退款
@@ -449,7 +449,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                                 } else {
                                     creditResultDetailDto.setExTaxMoney("-" + resultBean.getData().getMoney());
                                 }
-                            }
+                            }*/
+                            creditResultDetailDto.setExTaxMoney("-" + resultBean.getData().getMoney());
                             creditResultDetailDto.setUseTo(CwSystemYT.RONGZI_FANGKUAN.getType());
                             DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.RONGZI_FANGKUAN.getType(), "YT").getData();
                             creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());