Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeign.java

@@ -33,21 +33,6 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
-/**
- * Project: anrui-fin(平仓) <br/>
- * File: FinPaymentapplyDetailsBelowEveFeign.java <br/>
- * Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeign <br/>
- * Description: 付款申请明细-明细-平仓. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-13 10:03:07 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "付款申请明细-明细-平仓")
 @FeignClient(
         contextId = "anrui-fin-FinPaymentapplyDetailsBelowEve",

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java

@@ -71,7 +71,6 @@ public interface FinPaymentrecordFeign {
     @ResponseBody
     ResultBean batchUpdate(@RequestBody FinPaymentrecordUpdateDto dto);
 
-
     @ApiOperation("作废")
     @PostMapping("/updateState")
     @ResponseBody
@@ -91,9 +90,4 @@ public interface FinPaymentrecordFeign {
     @GetMapping("/fetchBySid")
     @ResponseBody
     ResultBean<FinPaymentrecord> fetchBySid(@RequestParam("sid") String sid);
-
-    @ApiOperation("出纳付款列表推送财务凭证")
-    @PostMapping("/pushVoucher")
-    @ResponseBody
-    public ResultBean pushVoucher(@RequestParam("sid") String sid);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java

@@ -30,19 +30,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-/**
- * Project: anrui-fin(财务) <br/>
- * File: FinPaymentrecordFeignFallback.java <br/>
- * Class: com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeignFallback <br/>
- * Description: fin_paymentrecord. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-06-23 13:45:10 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Component
 public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign {
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -731,36 +731,38 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                             //本次付款说明
                             finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany() + "/" + finPaymentapplyDetailsBelowDetailsVo.getRemarks());
                             finPaymentrecordService.saveDto(finPaymentrecordDto);
-                            List<FinPaymentapplyDetailsBelowEveDetailsVo> finPaymentapplyDetailsBelowEveList = finPaymentapplyDetailsBelowDetailsVo.getFinPaymentapplyDetailsBelowEveList();
-                            for (FinPaymentapplyDetailsBelowEveDetailsVo finPaymentapplyDetailsBelowEveDetailsVo : finPaymentapplyDetailsBelowEveList) {
-                                finPaymentrecordDto.setFinDataType(1);
-                                //款项名称
-                                finPaymentrecordDto.setCostTypeKey("");
-                                finPaymentrecordDto.setCostTypeValue(finPaymentapplyDetailsBelowEveDetailsVo.getCostTitleValue());
-                                //款项详情
-                                finPaymentrecordDto.setCostTitleKey("");
-                                finPaymentrecordDto.setCostTitleValue(finPaymentapplyDetailsBelowEveDetailsVo.getCostTitleValue());
-                                //付款方式
-                                finPaymentrecordDto.setPayWayKey(finPaymentapplyDetailsBelowDetailsVo.getPaymentTypeKey());
-                                finPaymentrecordDto.setPayWayValue(finPaymentapplyDetailsBelowDetailsVo.getPaymentType());
-                                //是否推送回款返利
-                                finPaymentrecordDto.setIsPushHkfl(0);
-                                finPaymentrecordDto.setBusSid(finPaymentapplyDetailsBelowEveDetailsVo.getSid());
-                                //收款银行账号
-                                finPaymentrecordDto.setReceiveBankAccount(finPaymentapplyDetailsBelowEveDetailsVo.getReceivingAccount());
-                                finPaymentrecordDto.setReceiveBank(finPaymentapplyDetailsBelowEveDetailsVo.getBank());
-                                //收款单位名称
-                                finPaymentrecordDto.setReceiveCompany(finPaymentapplyDetailsBelowEveDetailsVo.getReceiveCompany());
-                                //金额
-                                if (finPaymentapplyDetailsBelowEveDetailsVo.getExePayPrice() != null) {
-                                    finPaymentrecordDto.setCost(finPaymentapplyDetailsBelowEveDetailsVo.getExePayPrice().toString());
-                                    finPaymentrecordDto.setAccountsReceive(finPaymentapplyDetailsBelowEveDetailsVo.getExePayPrice().toString());
+                            List<FinPaymentapplyDetailsBelowEveDetailsVo> finPaymentapplyDetailsBelowEveList = finPaymentapplyDetailsBelowEveService.selByMainSid(finPaymentapplyDetailsBelowDetailsVo.getSid());
+                            if (finPaymentapplyDetailsBelowEveList != null){
+                                for (FinPaymentapplyDetailsBelowEveDetailsVo finPaymentapplyDetailsBelowEveDetailsVo : finPaymentapplyDetailsBelowEveList) {
+                                    finPaymentrecordDto.setFinDataType(1);
+                                    //款项名称
+                                    finPaymentrecordDto.setCostTypeKey("");
+                                    finPaymentrecordDto.setCostTypeValue(finPaymentapplyDetailsBelowEveDetailsVo.getCostTitleValue());
+                                    //款项详情
+                                    finPaymentrecordDto.setCostTitleKey("");
+                                    finPaymentrecordDto.setCostTitleValue(finPaymentapplyDetailsBelowEveDetailsVo.getCostTitleValue());
+                                    //付款方式
+                                    finPaymentrecordDto.setPayWayKey(finPaymentapplyDetailsBelowDetailsVo.getPaymentTypeKey());
+                                    finPaymentrecordDto.setPayWayValue(finPaymentapplyDetailsBelowDetailsVo.getPaymentType());
+                                    //是否推送回款返利
+                                    finPaymentrecordDto.setIsPushHkfl(0);
+                                    finPaymentrecordDto.setBusSid(finPaymentapplyDetailsBelowEveDetailsVo.getSid());
+                                    //收款银行账号
+                                    finPaymentrecordDto.setReceiveBankAccount(finPaymentapplyDetailsBelowEveDetailsVo.getReceivingAccount());
+                                    finPaymentrecordDto.setReceiveBank(finPaymentapplyDetailsBelowEveDetailsVo.getBank());
+                                    //收款单位名称
+                                    finPaymentrecordDto.setReceiveCompany(finPaymentapplyDetailsBelowEveDetailsVo.getReceiveCompany());
+                                    //金额
+                                    if (finPaymentapplyDetailsBelowEveDetailsVo.getExePayPrice() != null) {
+                                        finPaymentrecordDto.setCost(finPaymentapplyDetailsBelowEveDetailsVo.getExePayPrice().toString());
+                                        finPaymentrecordDto.setAccountsReceive(finPaymentapplyDetailsBelowEveDetailsVo.getExePayPrice().toString());
+                                    }
+                                    //备注
+                                    finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue());
+                                    //本次付款说明
+                                    finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany() + "/" + finPaymentapplyDetailsBelowEveDetailsVo.getRemarks());
+                                    finPaymentrecordService.saveDto(finPaymentrecordDto);
                                 }
-                                //备注
-                                finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue());
-                                //本次付款说明
-                                finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany() + "/" + finPaymentapplyDetailsBelowEveDetailsVo.getRemarks());
-                                finPaymentrecordService.saveDto(finPaymentrecordDto);
                             }
                         }
                     }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java

@@ -12,6 +12,7 @@ import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetai
 import com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService;
 import com.yxt.common.base.service.MybatisBaseService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -55,15 +56,25 @@ public class FinPaymentapplyDetailsService extends MybatisBaseService<FinPayment
             List<FinPaymentapplyDetailsBelowDto> finPaymentapplyDetailsBelowList = dto.getFinPaymentapplyDetailsBelowList();
             for (FinPaymentapplyDetailsBelowDto finPaymentapplyDetailsBelowDto : finPaymentapplyDetailsBelowList) {
                 finPaymentapplyDetailsBelowDto.setDetailSid(finPaymentapplyDetails.getSid());
-                finPaymentapplyDetailsBelowDto.setClosFundName(DateUtil.formatDate(new Date()) + dto.getPaymentType() + finPaymentapplyDetailsBelowDto.getBankShortName() + new BigDecimal(dto.getPayAccount()).divide(new BigDecimal(10000)) + "万元");
+                if (StringUtils.isBlank(finPaymentapplyDetailsBelowDto.getBankShortName())){
+                    finPaymentapplyDetailsBelowDto.setClosFundName(DateUtil.formatDate(new Date()) + dto.getPaymentType() + new BigDecimal(dto.getPayAccount()).divide(new BigDecimal(10000)) + "万元");
+                }else {
+                    finPaymentapplyDetailsBelowDto.setClosFundName(DateUtil.formatDate(new Date()) + dto.getPaymentType() + finPaymentapplyDetailsBelowDto.getBankShortName() + new BigDecimal(dto.getPayAccount()).divide(new BigDecimal(10000)) + "万元");
+                }
                 finPaymentapplyDetailsBelowDto.setPayCompanySid(finPaymentapply.getPayCompanySid());
                 finPaymentapplyDetailsBelowDto.setPayCompany(finPaymentapply.getPayCompany());
                 String belowSid = finPaymentapplyDetailsBelowService.insertByDto(finPaymentapplyDetailsBelowDto);
                 List<FinPaymentapplyDetailsBelowEveDto> finPaymentapplyDetailsBelowEveList = finPaymentapplyDetailsBelowDto.getFinPaymentapplyDetailsBelowEveList();
                 for (FinPaymentapplyDetailsBelowEveDto finPaymentapplyDetailsBelowEveDto : finPaymentapplyDetailsBelowEveList) {
                     finPaymentapplyDetailsBelowEveDto.setCreateBySid(finPaymentapply.getCreateBySid());
+                    finPaymentapplyDetailsBelowEveDto.setCostTitleValue(finPaymentapplyDetailsBelowDto.getClosFundName());
                     finPaymentapplyDetailsBelowEveDto.setDeptSid(finPaymentapply.getDeptSid());
                     finPaymentapplyDetailsBelowEveDto.setDeptName(finPaymentapply.getDeptName());
+                    finPaymentapplyDetailsBelowEveDto.setPayCompanySid(finPaymentapply.getPayCompanySid());
+                    finPaymentapplyDetailsBelowEveDto.setPayCompany(finPaymentapply.getPayCompany());
+                    finPaymentapplyDetailsBelowEveDto.setReceiveCompanySid(finPaymentapplyDetailsBelowDto.getReceiveCompanySid());
+                    finPaymentapplyDetailsBelowEveDto.setReceiveCompany(finPaymentapplyDetailsBelowDto.getReceiveCompany());
+                    finPaymentapplyDetailsBelowEveDto.setBank(finPaymentapplyDetailsBelowDto.getBank());
                     finPaymentapplyDetailsBelowEveDto.setUseOrgSid(finPaymentapply.getUseOrgSid());
                     finPaymentapplyDetailsBelowEveDto.setUseOrgName(finPaymentapply.getUseOrgName());
                     finPaymentapplyDetailsBelowEveDto.setDetailSid(belowSid);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java

@@ -35,6 +35,8 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo;
+
+import java.math.BigDecimal;
 import java.util.List;
 
 @Mapper
@@ -44,4 +46,7 @@ public interface FinPaymentapplyDetailsBelowEveMapper extends BaseMapper<FinPaym
 
     @Select("select * from fin_paymentapply_details_below_eve where detailSid = #{mainSid}")
     List<FinPaymentapplyDetailsBelowEveDetailsVo> selByMainSid(String mainSid);
+
+    @Select("SELECT SUM(exePayPrice) FROM fin_paymentapply_details_below_eve WHERE detailSid = #{detailSid}")
+    BigDecimal selExePayByMainSid(String detailSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java

@@ -43,6 +43,8 @@ import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetai
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
 import java.util.List;
 
 @Service
@@ -204,4 +206,8 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService<Fi
     public List<FinPaymentapplyDetailsBelowEveDetailsVo> selByMainSid(String mainSid) {
         return baseMapper.selByMainSid(mainSid);
     }
+
+    public BigDecimal selExePayByMainSid(String detailSid) {
+        return baseMapper.selExePayByMainSid(detailSid);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java

@@ -35,27 +35,12 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.math.BigDecimal;
 import java.util.List;
 
-/**
- * Project: anrui-fin(财务) <br/>
- * File: FinPaymentrecordMapper.java <br/>
- * Class: com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordMapper <br/>
- * Description: fin_paymentrecord. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-06-23 13:45:10 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface FinPaymentrecordMapper extends BaseMapper<FinPaymentrecord> {
 
-    //@Update("update fin_paymentrecord set name=#{msg} where id=#{id}")
-    //IPage<FinPaymentrecordVo> voPage(IPage<FinPaymentrecord> page, @Param(Constants.WRAPPER) QueryWrapper<FinPaymentrecord> qw);
-
     IPage<FinPaymentrecordVo> selectPageVo(IPage<FinPaymentrecord> page, @Param(Constants.WRAPPER) Wrapper<FinPaymentrecord> qw);
 
     List<FinPaymentrecordVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinPaymentrecord> qw);
@@ -70,4 +55,6 @@ public interface FinPaymentrecordMapper extends BaseMapper<FinPaymentrecord> {
     List<String> selectApplySidBySid(List<String> sids);
 
     String selectBatchNum(@Param("s") String s);
+
+    BigDecimal selPayPrice(String applySid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml

@@ -73,4 +73,12 @@
         order by id desc
             limit 1
     </select>
+
+    <select id="selPayPrice" resultType="java.math.BigDecimal">
+        SELECT SUM(cost)
+        FROM fin_paymentrecord
+        WHERE applySid = #{applySid}
+          AND state = 2
+          AND (costTitleKey = '' OR costTitleKey IS NULL)
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java

@@ -97,11 +97,4 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign {
         FinPaymentrecord finPaymentrecord = finPaymentrecordService.fetchBySid(sid);
         return rb.success().setData(finPaymentrecord);
     }
-
-    @Override
-    public ResultBean pushVoucher(String sid) {
-        ResultBean rb = ResultBean.fireFail();
-        finPaymentrecordService.pushVoucher(sid);
-        return rb.success();
-    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -52,6 +52,7 @@ import com.yxt.anrui.base.common.enums.DictCommonEnum;
 import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank;
 import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails;
+import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelow;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentrecord.*;
@@ -62,6 +63,7 @@ import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
 import com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankService;
 import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService;
+import com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService;
 import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService;
 import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRService;
@@ -189,6 +191,8 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
     @Autowired
     private DictCommonFeign dictCommonFeign;
     @Autowired
+    private FinPaymentapplyDetailsBelowService finPaymentapplyDetailsBelowService;
+    @Autowired
     private FinPaymentapplyDetailsBelowEveService finPaymentapplyDetailsBelowEveService;
 
     public PagerVo<FinPaymentrecordVo> listPageVo(PagerQuery<FinPaymentrecordQuery> pq) {
@@ -614,6 +618,9 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                         }
                         loanSettleApplyFeign.pushBankVoucher(finPaymentrecord.getBusSid(), accountNumber, payTypeCode, shouxufei);
                     }
+                } else if (StringUtils.isBlank(costTypeKey) || "015".equals(costTypeKey) || "016".equals(costTypeKey) || "017".equals(costTypeKey)) {
+                    Voucher voucher = pushVoucher(finPaymentrecord.getSid());
+                    voucherService.saveVoucher(voucher);
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -983,6 +990,11 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                             vouchers.add(v);
                         }
                     }
+                } else if (StringUtils.isBlank(costTypeKey) || "015".equals(costTypeKey) || "016".equals(costTypeKey) || "017".equals(costTypeKey)) {
+                    Voucher voucher = pushVoucher(finPaymentrecord.getSid());
+                    if (null != voucher) {
+                        vouchers.add(voucher);
+                    }
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -1625,7 +1637,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
     }
 
 
-    public void pushVoucher(String sid) {
+    public Voucher pushVoucher(String sid) {
         Voucher voucher = new Voucher();
         FinPaymentrecord finPaymentrecord = fetchBySid(sid);
         SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getUseOrgSid()).getData();
@@ -1675,25 +1687,57 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
             voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
             voucherResultDetailDtos.add(voucherResultDetailDto);
-        }else if (StringUtils.isBlank(finPaymentrecord.getCostTitleKey())){//平仓款
-            //借方
+        } else if (StringUtils.isBlank(finPaymentrecord.getCostTitleKey())) {//平仓款
+            //查询平仓总付款金额
             FinPaymentapplyDetailsBelowEve finPaymentapplyDetailsBelowEve = finPaymentapplyDetailsBelowEveService.fetchBySid(finPaymentrecord.getBusSid());
-            voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
-            voucherResultDetailDto.setSubjectNo("1009.03");
-            SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
-            voucherResultDetailDto.setDimensionDept(deptVo.getOrgCode());
-            String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData();
-            voucherResultDetailDto.setBank(key);
-            voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString());
-            voucherResultDetailDtos.add(voucherResultDetailDto);
-            //贷方
-            voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
-            voucherResultDetailDto.setSubjectNo("1002.01.00");
-            voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
-            voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
-            voucherResultDetailDtos.add(voucherResultDetailDto);
+            BigDecimal exePayPriceTotal = finPaymentapplyDetailsBelowEveService.selExePayByMainSid(finPaymentapplyDetailsBelowEve.getDetailSid());
+            //查询保证金
+            FinPaymentapplyDetailsBelow finPaymentapplyDetailsBelow = finPaymentapplyDetailsBelowService.fetchBySid(finPaymentapplyDetailsBelowEve.getDetailSid());
+            BigDecimal payAccount = finPaymentapplyDetailsBelow.getPayAccount();
+            //查询已付款平仓款金额
+            BigDecimal payPriceTotal = baseMapper.selPayPrice(finPaymentrecord.getApplySid());
+            if (payPriceTotal.add(finPaymentrecord.getCost()).compareTo(exePayPriceTotal) == -1) {
+                //借方
+                voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
+                voucherResultDetailDto.setSubjectNo("1009.03");
+                SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
+                voucherResultDetailDto.setDimensionDept(deptVo.getOrgCode());
+                String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData();
+                voucherResultDetailDto.setBank(key);
+                voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString());
+                voucherResultDetailDtos.add(voucherResultDetailDto);
+                //贷方
+                voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
+                voucherResultDetailDto.setSubjectNo("1002.01.00");
+                voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
+                voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
+                voucherResultDetailDtos.add(voucherResultDetailDto);
+            } else {
+                //借方
+                voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
+                voucherResultDetailDto.setSubjectNo("2111");
+                SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
+                voucherResultDetailDto.setDimensionDept(deptVo.getOrgCode());
+                String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData();
+                voucherResultDetailDto.setBank(key);
+                voucherResultDetailDto.setDebit(exePayPriceTotal.add(payAccount).toString());
+                voucherResultDetailDtos.add(voucherResultDetailDto);
+                //贷方1
+                voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
+                voucherResultDetailDto.setSubjectNo("1009.03");
+                voucherResultDetailDto.setDimensionDept(deptVo.getOrgCode());
+                voucherResultDetailDto.setBank(key);
+                voucherResultDetailDto.setCredit(payPriceTotal.add(payAccount).subtract(finPaymentrecord.getCost()).toString());
+                voucherResultDetailDtos.add(voucherResultDetailDto);
+                //贷方2
+                voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
+                voucherResultDetailDto.setSubjectNo("1002.01.00");
+                voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
+                voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
+                voucherResultDetailDtos.add(voucherResultDetailDto);
+            }
         }
         voucher.setResultDetails(voucherResultDetailDtos);
-        finKingDeeFeign.saveVoucher(voucher);
+        return voucher;
     }
 }