merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceBo.java

@@ -40,4 +40,6 @@ public class OrderInvoiceBo implements Serializable {
     private String SalerAddress = "广东省广州市天河区燕岭路123号3楼";
 
     private OrderInvoiceDetailBo invoiceDetail;
+
+    private String remark;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInvoiceServiceImpl.java

@@ -151,6 +151,7 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
         String invoiceOrderSn = DateUtils.getInvoiceOrderSn();
         invoiceBo.setOrderNo(invoiceOrderSn);
         invoiceBo.setInvoiceDate(DateUtils.timestampToDateFormat(DateUtils.getNowTime(),"yyyy-MM-dd HH:mm:ss"));
+        invoiceBo.setRemark(bo.getInvoiceRemark());
         if (bo.getSubject() == 1){
             //个人
             invoiceBo.setBuyerName(bo.getInvoiceTitle());
@@ -183,6 +184,7 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
         params.put("sign", sign);
         params.put("content", JSONObject.toJSONString(hostBo));
         params.put("orderNo", invoiceOrderSn);
+        params.put("fromPlat", "1");
         params.put("tenantId", ServletUtils.getRequest().getHeader("TenantId"));
         String respone = "";
         try {