电子发票业务流程优化

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/invoice/impl/InvoiceGroupServiceImpl.java

@@ -721,7 +721,7 @@ public class InvoiceGroupServiceImpl implements InvoiceGroupService {
 
                 if(invoice.getZkprice() != null && invoice.getZkprice().compareTo(BigDecimal.ZERO) > 0) {
                     JSONObject detailObj2 = new JSONObject();
-                    detailObj2.set("XH", index);
+                    detailObj2.set("XH", index+1);
                     //商品编码
                     detailObj2.set("SPBM", spbm);
                     //项目名称
@@ -742,7 +742,7 @@ public class InvoiceGroupServiceImpl implements InvoiceGroupService {
                     //扣除额
                     detailObj2.set("KCE", "");
                     //行性质。0-正常行 1-折扣行 2-被折扣行
-                    detailObj2.set("FPHXZ", "0");
+                    detailObj2.set("FPHXZ", "1");
                     //含税标志
                     detailObj2.set("HSBZ", "1");
                     //空：非零税率，1：免税，2：不征税 3:普通零税率
@@ -808,7 +808,7 @@ public class InvoiceGroupServiceImpl implements InvoiceGroupService {
                 }
             }
             //合计金额
-            reqObj.set("HJJE", taxExcludedAmount.setScale(2, RoundingMode.HALF_UP));
+            reqObj.set("HJJE", taxExcludedAmounttotal.setScale(2, RoundingMode.HALF_UP));
             //合计税额
             reqObj.set("HJSE", se.setScale(2, RoundingMode.HALF_UP));
             if (StringUtils.isNotBlank(remark)) {

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/invoice/impl/InvoiceServiceImpl.java

@@ -111,7 +111,7 @@ public class InvoiceServiceImpl implements InvoiceService {
             Asserts.isTrue(ObjectUtil.equals(order.getIsInvoice(), InvoiceStatusEnum.NOT_INVOICED.getValue())
                     || ObjectUtil.equals(order.getIsInvoice(), InvoiceStatusEnum.INVOICE_FAILED.getValue()), ORDER_INVOICED.getCode(), "订单{}已开票", orderNo);
             amt = amt.add(order.getPayAmount());
-            zk=zk.add(order.getAmount().multiply(order.getPayAmount()));
+            zk=zk.add(order.getAmount().subtract(order.getPayAmount()));
             //减去退款金额
             BigDecimal orderRefundAmount = tradeRefundRepositoryService.getOrderRefundAmount(order.getId());
             if (orderRefundAmount != null) {