Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
commit
2bd73a2837
  1. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  2. 4
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
  3. 4
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
  4. 2
      anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl
  5. 2
      anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl
  6. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
  7. 50
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  8. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java
  9. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
  10. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java
  11. 28
      anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(现车).docx
  12. 2410
      anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(现车).ftl
  13. 54
      anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(订车).docx
  14. 3458
      anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(订车).ftl
  15. 97
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

9
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@ -81,6 +81,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.io.File;
import java.io.InputStream;
import java.math.BigDecimal;
import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.*;
@ -1677,7 +1678,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//上装
if (appOrderDetailsVo.getTopInfo() != null) {
AppOrderTopInfoVo topInfo = appOrderDetailsVo.getTopInfo();
String topName = topInfo.getTopName();
String topName = appOrderDetailsVo.getTopMessage();
topName = "上装:" + topName + "。";
map.put("topName", topName);
}
@ -1706,7 +1707,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
}
//保险说明
String insuranceInfo = "保险说明:" + appOrderDetailsVo.getInsuranceInfo() + "。";
String insuranceInfo = "保险说明:" + appOrderDetailsVo.getInsuranceInfoMessage() + "。";
//车价合计
String totalPrice = priceInfo.getTotalPrice();
String priceRemarks = "";
@ -1769,7 +1770,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
/* Future<String> future1 = pool.submit(() -> {
/*Future<String> future1 = pool.submit(() -> {
return genCarSaleContract(dto, map, appOrderDetailsVo);
});
Future<String> future1_2 = pool.submit(() -> {
@ -1777,7 +1778,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
});*/
PrintConfirmVo printConfirmVo = null;
String urlAll = "";
/* Future<String> future2 = pool.submit(() -> {
/*Future<String> future2 = pool.submit(() -> {
return genCarSaleContractBlank(dto, map, appOrderDetailsVo);
});
Future<String> future2_2 = pool.submit(() -> {

4
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl

@ -1286,7 +1286,7 @@
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
</w:rPr>
<w:t>六、甲方负责提供车辆合格证及发票,因国家政策调整等原因致使无法办理落手续的后果由乙方承担。</w:t>
<w:t>六、甲方负责提供车辆合格证及发票,因国家政策调整等原因致使无法办理落手续的后果由乙方承担。</w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@ -1561,7 +1561,7 @@
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
</w:rPr>
<w:t> 年 月 日 年 月 日</w:t>
<w:t> 年 月 日 年 月 日</w:t>
</w:r>
</w:p>
<w:sectPr wsp:rsidR="00CE5AB6">

4
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl

@ -1286,7 +1286,7 @@
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
</w:rPr>
<w:t>六、甲方负责提供车辆合格证及发票,因国家政策调整等原因致使无法办理落手续的后果由乙方承担。</w:t>
<w:t>六、甲方负责提供车辆合格证及发票,因国家政策调整等原因致使无法办理落手续的后果由乙方承担。</w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@ -1561,7 +1561,7 @@
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
</w:rPr>
<w:t> 年 月 日 年 月 日</w:t>
<w:t> 年 月 日 年 月 日</w:t>
</w:r>
</w:p>
<w:sectPr wsp:rsidR="00CE5AB6">

2
anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl

@ -1409,7 +1409,7 @@
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
</w:rPr>
<w:t>六、甲方负责提供车辆合格证及发票,因国家政策调整等原因致使无法办理落手续的后果由乙方承担。</w:t>
<w:t>六、甲方负责提供车辆合格证及发票,因国家政策调整等原因致使无法办理落手续的后果由乙方承担。</w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">

2
anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl

@ -1409,7 +1409,7 @@
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
</w:rPr>
<w:t>六、甲方负责提供车辆合格证及发票,因国家政策调整等原因致使无法办理落手续的后果由乙方承担。</w:t>
<w:t>六、甲方负责提供车辆合格证及发票,因国家政策调整等原因致使无法办理落手续的后果由乙方承担。</w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java

@ -102,7 +102,13 @@ public class AppOrderDetailsVo implements Vo {
//中介人2
private SubmitVo intermediary2;
@ApiModelProperty("是否包含保险:0不包含,1包括")
private String isInsurance;
@ApiModelProperty("合同中的保险说明")
private String insuranceInfoMessage;
@ApiModelProperty("合同中的上装信息")
private String topMessage;
}

50
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -80,6 +80,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDt
import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance;
import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDto;
import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup;
import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDto;
import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
@ -2751,6 +2752,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
info = info + "\n\n" + "备注:" + busSalesOrderInsurance.getRemarks();
}
vo.setInsuranceInfo(info);
String infoMessage = "公司投保、"+x2+busSalesOrderInsurance.getInsuranceNum();
vo.setInsuranceInfoMessage(infoMessage);
}
} else {
if ("0".equals(busSalesOrder.getIsInsurance())) {
@ -2808,6 +2811,53 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
vo.setTopInfo(topInfo);
}
BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid);
String topMessage = "";
if(StringUtils.isNotBlank(busSalesOrderMakeup.getTopName())){
topMessage = topMessage+busSalesOrderMakeup.getTopName();
}
//委改方式
if(StringUtils.isNotBlank(busSalesOrderMakeup.getRefitMethod())){
topMessage = topMessage+ " "+ busSalesOrderMakeup.getRefitMethod();
}
//委改厂
if(StringUtils.isNotBlank(busSalesOrderMakeup.getRefitFactory())){
topMessage = topMessage+ " "+ busSalesOrderMakeup.getRefitFactory();
}
//外廓尺寸
String sizeMessage = "";
if(StringUtils.isNotBlank(busSalesOrderMakeup.getSizeLong())){
sizeMessage = "外廓尺寸"+busSalesOrderMakeup.getSizeLong()+"mm";
}
if(StringUtils.isNotBlank(busSalesOrderMakeup.getSizeWide())){
sizeMessage = sizeMessage+"*"+busSalesOrderMakeup.getSizeWide()+"mm";
}
if(StringUtils.isNotBlank(busSalesOrderMakeup.getSizeHigh())){
sizeMessage = sizeMessage+"*"+busSalesOrderMakeup.getSizeHigh()+"mm";
}
if(StringUtils.isNotBlank(sizeMessage)){
topMessage = topMessage+ " "+ sizeMessage;
}
//板材厚度
String ssMessage = "";
if(StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessBottom())){
ssMessage = "板材厚度"+busSalesOrderMakeup.getThicknessBottom()+"mm";
}
if(StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessEdge())){
ssMessage = ssMessage+"*"+busSalesOrderMakeup.getThicknessEdge()+"mm";
}
if(StringUtils.isNotBlank(ssMessage)){
topMessage = topMessage+ " "+ ssMessage;
}
if(StringUtils.isNotBlank(busSalesOrderMakeup.getPlateMaterial())){
topMessage = topMessage+ " "+ busSalesOrderMakeup.getPlateMaterial();
}
//公告型号
//其他配置
/*if(StringUtils.isNotBlank(busSalesOrderMakeup.getMoreConfig())){
topMessage = topMessage+busSalesOrderMakeup.getMoreConfig();
}*/
vo.setTopMessage(topMessage);
}
/***************************主车优惠***************************************/
List<AppOrderDiscountListVo> discountList = busSalesOrderDiscountService.selectDiscount(sid);

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java

@ -81,4 +81,6 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper<BusSalesOrderMakeu
* @return
*/
AppOrderTopInfoVo selectTop(String sid);
BusSalesOrderMakeup detailsss(String sid);
}

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@ -94,4 +94,8 @@
FROM bus_sales_order_makeup
where salesOrderSid = #{sid}
</select>
<select id="detailsss" resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup">
select * from bus_sales_order_makeup where salesOrderSid = #{sid}
</select>
</mapper>

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java

@ -248,4 +248,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
public AppOrderTopInfoVo selectTop(String sid) {
return baseMapper.selectTop(sid);
}
public BusSalesOrderMakeup detailsss(String sid) {
return baseMapper.detailsss(sid);
}
}

28
anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(现车).docx

@ -1,28 +0,0 @@
新车买卖合同(现车)
甲方(出卖方) : ${name}
乙方(买受方): ${customerName}
乙方从甲方以全款方式购买现车,现将双方权利和义务约定如下:
标的车辆基本信息
品牌型号
车架号
备注
1
${car_brand}
${car_vinNo}
${car_remarks}
二、单台车的车价为 ${monry} 元(大写 ${money1} )
三、乙方向甲方交纳订金 ${money2} 元,乙方提车时交清全部车款。甲方未收到全款前,
车辆所有权归甲方所有。乙方欠款提车后未按照约定时间交清全部款项的,甲方有权将车辆收回并处置。
四、车辆交付地点 ${address} ,乙方自提。
五、乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收,验收无异议的,甲方向乙方交付车钥匙,自此,车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险,未办理临牌和保险产生的后果全部由乙方承担。
六、甲方负责提供车辆合格证及发票,因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。
七、乙方交纳订金后在10日内不提车的,视为乙方单方放弃购车,甲方有权将车辆另行处置,订金不退。如果甲方同意乙方继续履行合同的,有权要求乙方每日按合同总价款的千分之一承担违约金。
乙方交纳订金后,因甲方原因导致乙方不能提车的,甲方退还乙方订金,合同终止不再履行。
八、本合同发生争议协商解决,协商不成向甲方所在地人民法院起诉解决。
九、本合同双方签字或盖章之时生效。
甲方:分公司名称(打印) 乙方: 客户签字
年 月 日 年 月 日

2410
anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(现车).ftl

File diff suppressed because it is too large

54
anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(订车).docx

@ -1,54 +0,0 @@
新车买卖合同(订车)
甲方(出卖方) : ${name}
乙方(买受方): ${customerName}
乙方从甲方以全款方式订购车辆 台,现将双方权利和义务约定如下:
甲方按照乙方要求订购排产的车辆型号及配置要求如下:
${carModel}
${brand}
${manName}
${color}
${engineType}
${gearboxType}
${rearAxle}
${capacity}
${displament}
${power}
${driveForm}
${airCondit}
${tyreSpecifi}
开门
举升方式
货厢尺寸
外廓尺寸:长 宽 高
板材材质: 板材厚度:
其他说明:
其他配置要求:${config}
二、单台车的车价为 元(大写 )
三、乙方向甲方交纳订金 元,乙方提车时交清全部车款。甲方未收到全款前,车辆所有权归甲方所有。乙方欠款提车后未按照约定时间交清全部款项的,甲方有权将车辆收回并处置。
四、车辆交付地点 ,乙方自提。
五、乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收,验收无异议的,甲方向乙方交付车钥匙,自此,车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险,未办理临牌和保险产生的后果全部由乙方承担。
六、甲方负责提供车辆合格证及发票,因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。
七、甲方通知乙方提车后,乙方在10日内不提车的,视为乙方单方放弃购车,甲方有权将车辆另行处置,订金不退。如果甲方同意乙方继续履行合同的,有权要求乙方每日按合同总价款的千分之一承担违约金。
乙方交纳订金后,因甲方原因导致乙方不能提车的,甲方退还乙方订金,合同终止不再履行。
八、本合同发生争议协商解决,协商不成向甲方所在地人民法院起诉解决。
九、本合同双方签字或盖章之时生效。
甲方: 乙方:
年 月 日 年 月 日

3458
anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(订车).ftl

File diff suppressed because it is too large

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

@ -258,13 +258,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return rb.setMsg("认款不完全,提交失败");
}
List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
if (paymentVoucherAppendixs.size() == 0) {
/*if (paymentVoucherAppendixs.size() == 0) {
return rb.setMsg("请上传打款凭证附件");
}
}*/
List<FinCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs();
if (remittanceConfirmationAppendixs.size() == 0) {
/*if (remittanceConfirmationAppendixs.size() == 0) {
return rb.setMsg("请上传汇款确认书附件");
}
}*/
if (finSelectedReceivablesDetailedDtos.size() > 0) {
for (FinSelectedReceivablesDetailedDto v : finSelectedReceivablesDetailedDtos) {
if (StringUtils.isBlank(v.getSubscriptionMoney())) {
@ -1302,42 +1302,51 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//往来单位
arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
fEntityList = new ArrayList<>();
String uncollSid = "";
//查询该客户的车架号不为空的情况
List<FinSelectedReceivablesDetailedVo> vinListVo = finSelectedReceivablesDetailedService.selectVinListVo(sid, 1, "车款", vo.getCustomerName(), vo.getCustomerPhone());
for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) {
vinListVo.removeAll(Collections.singleton(null));
if(!vinListVo.isEmpty()){
for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) {
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length()-8));
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
uncollSid = vvvv.getReceivablesSid();
}
}
//查询该客户的车架号为空的情况
FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "车款", vo.getCustomerName(), vo.getCustomerPhone());
if(vvVo != null){
uncollSid = vvVo.getReceivablesSid();
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length()-8));
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
//查询该客户的车架号为空的情况
FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "车款", vo.getCustomerName(), vo.getCustomerPhone());
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(vvVo.getReceivablesSid());
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(uncollSid);
if ("1".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) {
arReceivebill.setF_PAEZ_AssistantKey("001");
} else if ("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) {
@ -1441,37 +1450,43 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
fEntityList = new ArrayList<>();
//查询该客户的车架号不为空的情况
List<FinSelectedReceivablesDetailedVo> vinListVo = finSelectedReceivablesDetailedService.selectVinListVo(sid, 1, "订金", vo.getCustomerName(), vo.getCustomerPhone());
for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) {
vinListVo.removeAll(Collections.singleton(null));
if(!vinListVo.isEmpty()){
for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) {
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length()-8));
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
}
//查询该客户的车架号为空的情况
FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "订金", vo.getCustomerName(), vo.getCustomerPhone());
if(vvVo != null){
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length()-8));
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
//查询该客户的车架号为空的情况
FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "订金", vo.getCustomerName(), vo.getCustomerPhone());
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
arReceivebill.setF_PAEZ_AssistantKey("006");

Loading…
Cancel
Save