Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml

@@ -42,7 +42,7 @@
         select *
         from base_vehinstall
         where useOrgSid = #{useOrgSid}
-          and vinNo = #{vinNo}
+          and vinNo like concat('%',#{vinNo},'%')
     </select>
 
     <select id="seletByVinAndUseOrg" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstall">

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java

@@ -138,6 +138,8 @@ public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple
     private String billNo; // 单据编号
     @ApiModelProperty("提前领取发票原件原因")
     private String reason;
+    @ApiModelProperty("欠款开票单据编号（欠款领票使用）")
+    private String qkkpBillNo;
 
     @ApiModelProperty(value = "节点状态")
     private String nodeState;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -1363,6 +1363,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             //欠款金额合计
             BigDecimal qkMoneyTotal = qkMoneyOne.multiply(new BigDecimal(finBillVehicles.size()));
             finBillApplication.setArrearsMoney(qkMoneyTotal.toString());
+            //单台开票金额
+            BigDecimal oneBillMoney = finBillApplication.getOneBillMoney();
+            //计算开票金额合计
+            BigDecimal totalBillMoney = oneBillMoney.multiply(new BigDecimal(finBillVehicles.size()));
+            finBillApplication.setTotalBillMoney(totalBillMoney);
             save(finBillApplication);
             //主车开票信息
             for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
@@ -1543,6 +1548,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillApplication.setBillStateKey("004");
             finBillApplication.setBillStateValue("欠款领票");
             finBillApplication.setNum(finBillVehicles.size());
+            //单台开票金额
+            BigDecimal oneBillMoney = finBillApplication.getOneBillMoney();
+            //计算开票金额合计
+            BigDecimal totalBillMoney = oneBillMoney.multiply(new BigDecimal(finBillVehicles.size()));
+            finBillApplication.setTotalBillMoney(totalBillMoney);
             save(finBillApplication);
             //主车开票信息
             for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
@@ -2215,6 +2225,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     public ResultBean companyToDivisionOperateQK(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         FinBillApplication finBillApplication = fetchBySid(bv.getBusinessSid());
+        if (finBillApplication.getIsLQOrigInvoice().equals("否")){
+            ResultBean resultBean = completeQK(bv);
+            return resultBean;
+        }
         bv.setOrgSidPath(finBillApplication.getOrgSidPath());
         //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
         bv.getFormVariables().put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1954,10 +1954,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                             //外部金融：成交价 = 订金+车款+厂家贴息-服务费
                                             leftAll = leftAll.add(singleFinalPrice);
                                             if (StringUtils.isNotBlank(solutionsDetailsVo.getFactoryDiscount())) {
-                                                leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getFactoryDiscount()));
+                                                leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount()));
                                             }
                                             if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) {
-                                                leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getServiceAmount()));
+                                                leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getServiceAmount()));
                                             }
                                             rightAll = rightAll.add(bigDecimalVinAll);
                                         } else {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java

@@ -85,4 +85,9 @@ public class AdvanceInvoiceDto implements Dto {
     private String modelName; // 车型名称
     @ApiModelProperty("提前领取发票原件原因")
     private String reason;
+
+    @ApiModelProperty("开票总金额")
+    private String invoiceMoneyTotal;
+    @ApiModelProperty("欠款开票单据编号（欠款领票使用）")
+    private String qkkpBillNo;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java

@@ -38,12 +38,14 @@ public class AdvanceInvoiceInfoVo implements Vo {
     private String openTickSid;
     @ApiModelProperty("默认开票名称")
     private String openTickName;
-    @ApiModelProperty("单台开票价")
-    private String invoiceMoney;
     @ApiModelProperty("选择车辆列表")
     private List<AppCarListVo> vinList  = new ArrayList<>();
+    @ApiModelProperty("单台开票价")
+    private String invoiceMoney;
     @ApiModelProperty("欠款总金额")
     private String invoiceTotal;
+    @ApiModelProperty("开票总金额")
+    private String invoiceMoneyTotal;
     @ApiModelProperty("回款日期")
     private String collectionDate;
     @ApiModelProperty("欠款原因key")
@@ -88,4 +90,6 @@ public class AdvanceInvoiceInfoVo implements Vo {
     private String modelName;
     @ApiModelProperty("提前领取发票原件原因")
     private String reason;
+    @ApiModelProperty("欠款开票单据编号（欠款领票使用）")
+    private String qkkpBillNo;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@@ -325,6 +325,7 @@ public class AppBusAdvanceGinvoiceapplyService {
         vo.setGetOriginalValue(finBillApplicationDetailsVo.getIsLQOrigInvoice());
         vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid());
         vo.setInvoiceTotal(finBillApplicationDetailsVo.getArrearsMoney());
+        vo.setInvoiceMoneyTotal(finBillApplicationDetailsVo.getTotalBillMoney());
         vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath());
         vo.setSaleType(finBillApplicationDetailsVo.getSaleTypeValue());
         vo.setSellerDept(finBillApplicationDetailsVo.getSaleDeptName());
@@ -340,6 +341,16 @@ public class AppBusAdvanceGinvoiceapplyService {
         vo.setModelSid(finBillApplicationDetailsVo.getModelSid());
         vo.setModelName(finBillApplicationDetailsVo.getModelName());
         vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName());
+        String reasonValue = vo.getReasonValue();
+        String remarks = vo.getRemarks();
+        String reasonRemarks = "";
+        if (StringUtils.isNotBlank(remarks)){
+            reasonRemarks = reasonValue + " \n" + remarks;
+        }else {
+            reasonRemarks = reasonValue;
+        }
+        vo.setReasonRemarks(reasonRemarks);
+        vo.setReason(finBillApplicationDetailsVo.getReason());
         //车辆信息
         List<AppCarListVo> vinListVos = new ArrayList<>();
         List<FinBillVehicleVo> finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles();
@@ -498,6 +509,12 @@ public class AppBusAdvanceGinvoiceapplyService {
         FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
         BeanUtil.copyProperties(dto, finBillApplicationDto);
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
+        if (StringUtils.isBlank(dto.getQkkpBillNo())){
+            finBillApplicationDto.setQkkpBillNo(dto.getBillNo());
+        }else {
+            finBillApplicationDto.setQkkpBillNo(dto.getQkkpBillNo());
+        }
+        finBillApplicationDto.setTotalBillMoney(dto.getInvoiceMoneyTotal());
         finBillApplicationDto.setUseOrgSid(useOrgSid);
         finBillApplicationDto.setCreateBySid(dto.getUserSid());
         finBillApplicationDto.setArrearsMoney(dto.getInvoiceTotal());