修改账户显示取值

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java

@@ -206,6 +206,14 @@ public class AisinoInvoiceRequestAdapterImpl implements IInvoiceRequestService {
                     }
                 }
 
+                if (StringUtils.isBlank(billInfo.getSellerBank())){
+                    billInfo.setSellerBank(json.getString("xsfkhh"));
+                }
+
+                if (StringUtils.isBlank(billInfo.getSellerAccount())){
+                    billInfo.setSellerAccount(json.getString("xsfyhzh"));
+                }
+
                 json = (JSONObject) JSONObject.toJSON(billInfo);
             }
 

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java

@@ -153,20 +153,45 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
             log.error("【销项】【大象发票】开票接口校验异常", e);
             return new HXResponse("格式校验失败，请检查报文");
         }
+        log.info("billInfo信息：{}",JSONObject.toJSONString(billInfo));
 
         // 订单头信息
         DDTXX ddtxx = new DDTXX(billInfo);
 
-        log.info("大象V6开票接口订单头信息：{}",JSONObject.toJSONString(ddtxx));
         CompanyserviceProp companyserviceProp = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), "account_show");
 
         if (companyserviceProp != null && "1".equals(companyserviceProp.getValue())){
             StringBuilder bz = new StringBuilder();
             if (StringUtils.isNotBlank(ddtxx.getBZ())){
-                bz.append(ddtxx.getBZ()+"\n");
+                bz.append(ddtxx.getBZ()).append("\n");
             }
-            bz.append("购方开户银行："+ddtxx.getGMFYH()+"\t银行账号："+ddtxx.getGMFZH()+"\n");
-            bz.append("销方开户银行："+ddtxx.getXHFYH()+"\t银行账号："+ddtxx.getXHFZH());
+            String buyerBank = billInfo.getBuyerBank();
+            String buyerAccount = billInfo.getBuyerAccount();
+            String sellerAccount = billInfo.getSellerAccount();
+            String sellerBank = billInfo.getSellerBank();
+
+
+            bz.append("购方开户银行账号：");
+
+            if (StringUtils.isNotBlank(buyerBank)) {
+                bz.append("\t").append(buyerBank);
+            }
+            if (StringUtils.isNotBlank(buyerAccount)) {
+                bz.append("\t").append(buyerAccount);
+            }
+
+            bz.append("\n");
+
+            bz.append("销方开户银行账号：");
+
+            if (StringUtils.isNotBlank(sellerBank)) {
+                bz.append("\t").append(sellerBank);
+            }
+            if (StringUtils.isNotBlank(sellerAccount)) {
+                bz.append("\t").append(sellerAccount);
+            }
+
+            log.info("备注信息：\n{}",bz.toString());
             ddtxx.setBZ(bz.toString());
         }