Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -1485,15 +1485,31 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         appDeliveredDetailsVo.setContractId(busDeliveredApply.getContractNo());
         appDeliveredDetailsVo.setPublishInfo(busDeliveredApply.getApplyDept() + "-" + busDeliveredApply.getApplyName());
         appDeliveredDetailsVo.setCreateTime(DateUtil.format(busDeliveredApply.getCreateTime(), "yyyy-MM-dd"));
+        //pc发起人
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getStaffUserSid());
+        if (!userVoResultBean.getSuccess()) {
+            return rb.setMsg(userVoResultBean.getMsg());
+        }
+        appDeliveredDetailsVo.setPcApplyName(busDeliveredApply.getApplyName());
+        appDeliveredDetailsVo.setPcApplySid(busDeliveredApply.getApplySid());
+        appDeliveredDetailsVo.setPcApplyDept(busDeliveredApply.getApplyDept());
+        appDeliveredDetailsVo.setPcApplyDeptSid(busDeliveredApply.getApplyDeptSid());
+        appDeliveredDetailsVo.setPcStaffSid(userVoResultBean.getData().getStaffSid());
+        List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(sid);
+        detailsList.removeAll(Collections.singleton(null));
         if (StringUtils.isNotBlank(busDeliveredApply.getDistributorPrice())) {
             appDeliveredDetailsVo.setDistributorName(busDeliveredApply.getDistributorName() + ",单车中介费：" + busDeliveredApply.getDistributorPrice() + "元");
+            appDeliveredDetailsVo.setPcDistributorName(busDeliveredApply.getDistributorName());
+            appDeliveredDetailsVo.setPcDistributorPrice(busDeliveredApply.getDistributorPrice());
+            appDeliveredDetailsVo.setPcDistributorPriceAll(new BigDecimal(busDeliveredApply.getDistributorPrice()).multiply(new BigDecimal(detailsList.size())).toString());
         }
         if (StringUtils.isNotBlank(busDeliveredApply.getDistributorPriceTwo())) {
             appDeliveredDetailsVo.setDistributorNameTwo(busDeliveredApply.getDistributorNameTwo() + ",单车中介费：" + busDeliveredApply.getDistributorPriceTwo() + "元");
+            appDeliveredDetailsVo.setPcDistributorNameTwo(busDeliveredApply.getDistributorNameTwo());
+            appDeliveredDetailsVo.setPcDistributorPriceTwo(busDeliveredApply.getDistributorPriceTwo());
+            appDeliveredDetailsVo.setPcDistributorPriceTwoAll(new BigDecimal(busDeliveredApply.getDistributorPriceTwo()).multiply(new BigDecimal(detailsList.size())).toString());
         }
         List<AppCarListVo> carList = new ArrayList<>();
-        List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(sid);
-        detailsList.removeAll(Collections.singleton(null));
         if (!detailsList.isEmpty()) {
             for (int i = 0; i < detailsList.size(); i++) {
                 BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -35,6 +35,7 @@ import com.yxt.anrui.base.api.basetrailer.TrailerVo;
 import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate;
@@ -97,6 +98,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     private FinBillVehicleFeign finBillVehicleFeign;
     @Autowired
     private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
+    @Autowired
+    private BaseVehicleAppendixFeign baseVehicleAppendixFeign;
 
     public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) {
         if (list.size() > 0) {
@@ -301,6 +304,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
                 if (baseVehicleCertificateVo != null){
                     busVehicleQKKPVo.setCertificateState(baseVehicleCertificateVo.getCertificateState());
                     busVehicleQKKPVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
+                    List<String> stringList = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData();
+                    busVehicleQKKPVo.setZcHgzImages(stringList);
                 }
                 TraliveredVo traliveredVo = baseTrailerFeign.trailerList(busVehicleQKKPVo.getVehSid(), query.getContractNo()).getData();
                 List<TrailerVo> trailerVos = traliveredVo.getList();

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java

@@ -25,11 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.fincompanyinvoicing;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -85,4 +85,11 @@ public interface FinCompanyInvoicingFeign {
     @GetMapping("/getDetailsByUseOrgAndSystem")
     @ResponseBody
     public ResultBean<FinCompanyInvoicingDetailsVo> getDetailsByUseOrgAndSystem(@RequestParam("useOrgSid")String useOrgSid,@RequestParam("systemSid")String systemSid);
+
+    @ApiOperation("根据分公司查询开票信息")
+    @GetMapping("/selectInvoingList")
+    @ResponseBody
+    ResultBean<List<InvoicingVo>> selectInvoingList(@RequestParam("busSid")String busSid);
+
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java

@@ -79,4 +79,9 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig
 	public ResultBean<FinCompanyInvoicingDetailsVo> getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<InvoicingVo>> selectInvoingList(String busSid) {
+		return null;
+	}
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/InvoicingVo.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.fin.api.fincompanyinvoicing;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 开票信息
+ * @author: dimengzhe
+ * @date: 2023/5/19
+ **/
+@Data
+public class InvoicingVo implements Vo {
+    private static final long serialVersionUID = 1044076091993510821L;
+
+    @ApiModelProperty("开票信息sid")
+    private String sid;
+
+    private String dictKey;
+
+    private String dictValue;
+
+}

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

@@ -458,6 +458,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     }
                 }
                 finBillTrailerVo.setHgzImageUrl(hgzImageUrls);
+                finBillTrailerVo.setOneBillMoney(baseTrailerDetailsVo.getDealPrice());
             }
             vo.setFinBillTrailers(finBillTrailerVos);
         }

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

@@ -1217,7 +1217,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         ARReceivebill.FRECEIVEBILLENTRY freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
         //推送全款车款
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款", "1");
-        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "首付款", "1");
+        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "首付款及费用", "1");
         //推送全款订金
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金", "1");
         //贷款推送车款
@@ -1308,7 +1308,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     if (customerList.size() == 1 && finSelectedReceivablesDetailedVos2.size() == 0) {
                         arReceivebill.setFBillNo(confirmation.getBillNo());
                     } else {
-                        carSize = i + 1;
+                        carSize = carSize + 1;
                         arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize);
                     }
                     ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
@@ -1351,9 +1351,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         }
                         arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
                         if (finSelectedReceivablesDetailedVos1.size() > 1) {
-                            int size = 0;
-                            size = i + 1;
-                            arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + size);
+                            carSize = carSize + 1;
+                            arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize);
                         } else {
                             arReceivebill.setFBillNo(confirmation.getBillNo());
                         }
@@ -1440,7 +1439,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     if (customerList.size() == 1 && finSelectedReceivablesDetailedVos2.size() == 0 && finSelectedReceivablesDetailedVos1.size() == 0) {
                         arReceivebill.setFBillNo(confirmation.getBillNo());
                     } else {
-                        carSize = i + 1;
+                        carSize = carSize + 1;
                         arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize);
                     }
                     ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
@@ -1483,9 +1482,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         }
                         arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
                         if (finSelectedReceivablesDetailedVos1_1_1.size() > 1) {
-                            int size = 0;
-                            size = i + 1;
-                            arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + size);
+                            carSize = carSize + 1;
+                            arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize);
                         } else {
                             arReceivebill.setFBillNo(confirmation.getBillNo());
                         }
@@ -1604,9 +1602,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
                         arReceivebill.setF_PAEZ_AssistantKey("006");
                         if (finSelectedReceivablesDetailedVos2.size() > 1) {
-                            int size = 0;
-                            size = i + 1;
-                            arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + size);
+                            carSize = carSize + 1;
+                            arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize);
                         } else {
                             arReceivebill.setFBillNo(confirmation.getBillNo());
                         }
@@ -2315,7 +2312,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         ARReceivebill.FRECEIVEBILLENTRY freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
         //推送全款车款
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款", "1");
-        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "首付款", "1");
+        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "首付款及费用", "1");
         //推送全款订金
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金", "1");
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.InvoicingVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -68,4 +69,6 @@ public interface FinCompanyInvoicingMapper extends BaseMapper<FinCompanyInvoicin
 	FinCompanyInvoicingDetailsVo fetchByUseOrgSid(String useOrgSid);
 
     FinCompanyInvoicingDetailsVo getDetailsByUseOrgAndSystem(@Param("useOrgSid") String useOrgSid, @Param("systemSid") String systemSid);
+
+	List<InvoicingVo> selectInvoingList(String useOrgSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml

@@ -17,4 +17,8 @@
             resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo">
 		select * from fin_company_invoicing where useOrgSid = #{useOrgSid} and purchaseSystemSid = #{systemSid} limit 1
     </select>
+
+	<select id="selectInvoingList" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.InvoicingVo">
+		select name dictValue,sid,sid as dictKey from fin_company_invoicing where useOrgSid = #{useOrgSid}
+	</select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.fincompanyinvoicing;
 
+import com.yxt.anrui.fin.api.fincompanyinvoicing.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicing;
-import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingQuery;
-import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingVo;
-import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
-import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDto;
-import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
 
 /**
  * Project: anrui-fin(公司开票信息管理) <br/>
@@ -107,4 +102,9 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
 	public ResultBean<FinCompanyInvoicingDetailsVo> getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) {
 		return finCompanyInvoicingService.getDetailsByUseOrgAndSystem(useOrgSid,systemSid);
 	}
+
+	@Override
+	public ResultBean<List<InvoicingVo>> selectInvoingList(String busSid) {
+		return finCompanyInvoicingService.selectInvoingList(busSid);
+	}
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@@ -28,6 +28,8 @@ package com.yxt.anrui.fin.biz.fincompanyinvoicing;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.*;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -37,9 +39,12 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Project: anrui-fin(公司开票信息管理) <br/>
@@ -59,6 +64,8 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
 
     @Resource
     private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private BusSalesOrderFeign busSalesOrderFeign;
 
     private QueryWrapper<FinCompanyInvoicing> createQueryWrapper(FinCompanyInvoicingQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -140,4 +147,16 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         FinCompanyInvoicingDetailsVo vo = baseMapper.getDetailsByUseOrgAndSystem(useOrgSid,systemSid);
         return rb.success().setData(vo);
     }
+
+    public ResultBean<List<InvoicingVo>> selectInvoingList(String busSid) {
+        ResultBean<List<InvoicingVo>> rb = ResultBean.fireFail();
+        List<InvoicingVo> list = new ArrayList<>();
+        //查询销售订单的信息
+        ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderFeign.getSaleOrderDetails(busSid);
+        if(resultBean.getData() != null){
+            AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
+            list = baseMapper.selectInvoingList(appOrderDetailsVo.getUseOrgSid());
+        }
+        return rb.success().setData(list);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -140,10 +140,13 @@
     </select>
 
     <select id="selectByContractNoOne" resultType="java.lang.String">
-        select distinct fun.busVinSid
+        select fun.busVinSid
         from fin_uncollected_receivables_detailed fun
+        left join fin_uncollected_receivables_detailed fun1 on fun.busVinSid = fun1.busVinSid
         where fun.contractNo = #{contractNo}
-          and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0)
+        and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0 )
+        and fun.receivablesName='订金' and (fun1.currentReceivableMoney &lt; 0 or fun1.currentReceivableMoney = 0 )
+        and (fun1.receivablesName='首付款及费用' or fun1.receivablesName = '车款')
     </select>
 
     <select id="selectByCreateBySidOne" resultType="java.lang.String">

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceDto.java

@@ -26,4 +26,7 @@ public class InsuranceDto implements Dto {
 
     @ApiModelProperty("合同sid")
     private String contractSid;
+
+    @ApiModelProperty("甲方主体")
+    private String createOrgName;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java

@@ -107,6 +107,7 @@ public class AppRovalService {
             vinListVo.setInvoiceType("机动车销售统一发票");
             vinListVo.setCertificateStateKey(busVehicleQKKPVo.getCertificateState());
             vinListVo.setCertificateState(busVehicleQKKPVo.getCertificateStateValue());
+            vinListVo.setZcHgzImages(busVehicleQKKPVo.getZcHgzImages());
             List<BusVehicleQKKPTrailerVo> trailers = busVehicleQKKPVo.getTrailers();
             ArrayList<FinBillTrailerVo> finBillTrailerVos = new ArrayList<>();
             if (trailers != null){

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@@ -132,6 +132,7 @@ public class InvoicedService {
             vinListVo.setOpenTickSid(finBillVehicle.getOpenTickSid());
             vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
             vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
+            vinListVo.setZcHgzImages(finBillVehicle.getCertificatePhoto());
             vinListVos.add(vinListVo);
         }
         vo.setVinList(vinListVos);
@@ -144,6 +145,7 @@ public class InvoicedService {
                 BeanUtil.copyProperties(finBillTrailer,finBillTrailerVo);
                 List<String> hgzImageUrl = finBillTrailer.getHgzImageUrl();
                 finBillTrailerVo.setFiles(hgzImageUrl);
+                finBillTrailerVo.setOneBillMoney(finBillTrailer.getOneBillMoney());
                 finBillTrailerVos.add(finBillTrailerVo);
             }
         }