|
@@ -499,6 +499,21 @@ public class InvoiceManageService implements BaseService<InvoiceManage, InvoiceM
|
|
|
def26 = def26 + parkInfo.getGroupName() + roomResponse.getDiscName() + roomResponse.getBuildName()
|
|
|
+ "号" + roomResponse.getRoomNo() + "室";
|
|
|
|
|
|
+ ContractManage contractManage = contractManageService.selectByPrimaryKey(newRecord.getContractId());
|
|
|
+ // 是否完全收款 默认不完全收款
|
|
|
+ String def27 = "N";
|
|
|
+ // 正常房款
|
|
|
+ if(newRecord.getPaymentType().equals("1")){
|
|
|
+ if(contractManage.getCollectionStatus() == 2){
|
|
|
+ def27 = "Y";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 专项维修资金
|
|
|
+ if(newRecord.getPaymentType().equals("2")){
|
|
|
+ if(contractManage.getFundCollectionStatus() == 2){
|
|
|
+ def27 = "Y";
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
Double invoiceTax = Double.parseDouble(model.getInvoiceTax()) * 100;
|
|
|
JSONObject json = new JSONObject();
|
|
@@ -515,6 +530,7 @@ public class InvoiceManageService implements BaseService<InvoiceManage, InvoiceM
|
|
|
ar_recbill.put("def24", "0"); //征税方式,必填,默认0
|
|
|
ar_recbill.put("def26", def26); //不动产地址 必填
|
|
|
ar_recbill.put("def25", "N"); // 跨地市标志,必填,Y--是;N---否
|
|
|
+ ar_recbill.put("def27", "Y"); // 是否完全收款,非必填,Y--是;N---否
|
|
|
json.put("ar_recbill", ar_recbill);
|
|
|
|
|
|
JSONArray ar_recitem = new JSONArray();
|