Merge branch 'master' into dev

service/src/main/java/com/kym/service/miniapp/impl/InvoiceServiceImpl.java

@@ -98,9 +98,10 @@ public class InvoiceServiceImpl extends MPJBaseServiceImpl<InvoiceMapper, Invoic
                 .setOpenid(StpUtil.getSession().getString("openid"))
                 .setApplyId(OrderUtils.getOrderNo())
                 .setOrderDetails(orderDetails) // 订单信息
-                .setInvoiceAmount(totalPayAmount)   // 总金额
+                .setInvoiceAmount(totalPayAmount)   // 发票金额
+                .setTotalMoney(elecMoney + serviceMoney) // 订单总金额
                 .setElecMoney(elecMoney)    // 电费
-                .setElecMoney(serviceMoney)    // 服务费
+                .setServiceMoney(serviceMoney)    // 服务费
                 .setTotalPower(orders.stream().mapToDouble(ChargeOrder::getTotalPower).sum())   // 总电量
                 .setServiceMoneyDiscount(orders.stream().mapToInt(ChargeOrder::getServiceMoneyDiscount).sum()); //总优惠服务费
         baseMapper.insert(invoice);