feature:汇总文案

src/main/java/com/ywt/mg/domain/entities/OrderPayment.java

@@ -68,7 +68,7 @@ public class OrderPayment implements Serializable {
   private BigDecimal orderAmount;
 
   /**
-   * 实际支付金额
+   * 实际支付总额
    */
   @Column(name = "payment_amount", nullable = false)
   private BigDecimal paymentAmount;
@@ -404,14 +404,14 @@ public class OrderPayment implements Serializable {
   }
 
   /**
-   * 实际支付金额
+   * 实际支付总额
    */
   public BigDecimal getPaymentAmount() {
     return paymentAmount;
   }
 
   /**
-   * 实际支付金额
+   * 实际支付总额
    */
   public void setPaymentAmount(BigDecimal paymentAmount) {
     this.paymentAmount = paymentAmount;

src/main/java/com/ywt/mg/services/CheckUpOrderService.java

@@ -229,7 +229,7 @@ public class CheckUpOrderService {
         List<ExcelCollectPojo> customExcelItemList = new ArrayList<>();
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows , new String[]{"支付总额", FormatUtil.intShrink100ToStr(payTotal)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows , new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows , new String[]{"实际支付金额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows , new String[]{"实际支付总额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
 
 //        startRows += 1;
 
@@ -265,7 +265,7 @@ public class CheckUpOrderService {
                         int refundAmount = refundList.stream().filter(p -> Checker.getIntegerValue(p.getPaymentChannel()) == paymentChannel).mapToInt(CheckUpOrder::getAmount).sum();
                         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{paymentChannelName + "支付总额", FormatUtil.intShrink100ToStr(paymentAmount)}));
                         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{paymentChannelName + "退款总额", FormatUtil.intShrink100ToStr(refundAmount)}));
-                        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{paymentChannelName + "实际支付金额", FormatUtil.intShrink100ToStr(paymentAmount - refundAmount)}));
+                        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{paymentChannelName + "实际支付总额", FormatUtil.intShrink100ToStr(paymentAmount - refundAmount)}));
                     }
                 }
             }

src/main/java/com/ywt/mg/services/DepositService.java

@@ -505,7 +505,7 @@ public class DepositService {
         int refundTotal = 0;
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{"支付总额", FormatUtil.intShrink100ToStr(payTotal)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"实际支付金额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"实际支付总额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
         startRows += 1;
 
 
@@ -518,7 +518,7 @@ public class DepositService {
 
                 customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{payChannelStr + "支付总额", FormatUtil.intShrink100ToStr(payValue)}));
                 customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{payChannelStr + "退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
-                customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{payChannelStr + "实际支付金额", FormatUtil.intShrink100ToStr(payValue - refundTotal)}));
+                customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{payChannelStr + "实际支付总额", FormatUtil.intShrink100ToStr(payValue - refundTotal)}));
                 startRows += 1;
             }
 

src/main/java/com/ywt/mg/services/NatOrderService.java

@@ -252,7 +252,7 @@ public class NatOrderService {
         List<ExcelCollectPojo> customExcelItemList = new ArrayList<>();
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{"支付总额", FormatUtil.intShrink100ToStr(payTotal)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"实际支付金额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"实际支付总额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
 
 
         if (!Checker.isNone(itemList)) {
@@ -282,7 +282,7 @@ public class NatOrderService {
                         int refundAmount = refundList.stream().filter(p -> Checker.getIntegerValue(p.getPaymentChannel()) == paymentChannel).mapToInt(NatOrder::getAmount).sum();
                         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{paymentChannelName + "支付总额", FormatUtil.intShrink100ToStr(paymentAmount)}));
                         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{paymentChannelName + "退款总额", FormatUtil.intShrink100ToStr(refundAmount)}));
-                        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{paymentChannelName + "实际支付金额", FormatUtil.intShrink100ToStr(paymentAmount - refundAmount)}));
+                        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{paymentChannelName + "实际支付总额", FormatUtil.intShrink100ToStr(paymentAmount - refundAmount)}));
                     }
                 }
             }

src/main/java/com/ywt/mg/services/OfflineNewService.java

@@ -371,7 +371,7 @@ public class OfflineNewService {
         List<ExcelCollectPojo> customExcelItemList = new ArrayList<>();
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 1, new String[]{"支付总额", FormatUtil.intShrink100ToStr(payTotal)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 2, new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 3, new String[]{"实际支付金额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 3, new String[]{"实际支付总额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
         PaymentChannelEnum[] paymentChannelList = PaymentChannelEnum.values();
         if (!Checker.isNone(paymentChannelList)) {
             for (int i = 0, j = paymentChannelList.length; i < j; i++) {
@@ -387,7 +387,7 @@ public class OfflineNewService {
                     startRows += 1;
                     customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 1, new String[]{paymentChannelName + "支付总额", FormatUtil.intShrink100ToStr(payValue)}));
                     customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows + 2, new String[]{paymentChannelName + "退款总额", FormatUtil.intShrink100ToStr(refundValue)}));
-                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows + 5, new String[]{paymentChannelName + "实际支付金额", FormatUtil.intShrink100ToStr(payValue - refundValue)}));
+                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows + 5, new String[]{paymentChannelName + "实际支付总额", FormatUtil.intShrink100ToStr(payValue - refundValue)}));
                 }
             }
         }

src/main/java/com/ywt/mg/services/OutpatientOrderService.java

@@ -455,7 +455,7 @@ public class OutpatientOrderService {
         List<ExcelCollectPojo> customExcelItemList = new ArrayList<>();
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 1, new String[]{"支付总额", FormatUtil.intShrink100ToStr(payTotal)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows + 1, new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows + 1, new String[]{"实际支付金额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows + 1, new String[]{"实际支付总额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
         PaymentChannelEnum[] paymentChannelList = PaymentChannelEnum.values();
         if (!Checker.isNone(paymentChannelList)) {
             for (int i = 0, j = paymentChannelList.length; i < j; i++) {
@@ -471,7 +471,7 @@ public class OutpatientOrderService {
                     startRows += 1;
                     customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 1, new String[]{paymentChannelName + "支付总额", FormatUtil.intShrink100ToStr(payValue)}));
                     customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows + 2, new String[]{paymentChannelName + "退款总额", FormatUtil.intShrink100ToStr(refundValue)}));
-                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows + 5, new String[]{paymentChannelName + "实际支付金额", FormatUtil.intShrink100ToStr(payValue - refundValue)}));
+                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows + 5, new String[]{paymentChannelName + "实际支付总额", FormatUtil.intShrink100ToStr(payValue - refundValue)}));
                 }
             }
         }

src/main/java/com/ywt/mg/services/PharmacyService.java

@@ -511,12 +511,12 @@ public class PharmacyService {
         List<ExcelCollectPojo> customExcelItemList = new ArrayList<>();
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{"支付总额", FormatUtil.intShrink100ToStr(payTotal)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"实际支付金额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"实际支付总额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
         startRows += 1;
 
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{"微信支付总额", FormatUtil.intShrink100ToStr(weChatPay)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{"微信退费总额", FormatUtil.intShrink100ToStr(weChatRefundTotal)}));
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"微信实际支付金额", FormatUtil.intShrink100ToStr(weChatPay - weChatRefundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"微信实际支付总额", FormatUtil.intShrink100ToStr(weChatPay - weChatRefundTotal)}));
         startRows += 1;
 
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{"支付宝支付", FormatUtil.intShrink100ToStr(aliPay)}));
@@ -531,22 +531,22 @@ public class PharmacyService {
 
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{"诊疗卡支付", FormatUtil.intShrink100ToStr(medicalCardPay)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{"诊疗卡退款总额", FormatUtil.intShrink100ToStr(medicalCardRefundTotal)}));
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"诊疗卡实际支付金额", FormatUtil.intShrink100ToStr(medicalCardPay - medicalCardRefundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"诊疗卡实际支付总额", FormatUtil.intShrink100ToStr(medicalCardPay - medicalCardRefundTotal)}));
         startRows += 1;
 
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{"POS支付", FormatUtil.intShrink100ToStr(posPay)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{"POS退款总额", FormatUtil.intShrink100ToStr(posRefundTotal)}));
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"POS实际支付金额", FormatUtil.intShrink100ToStr(posPay - posRefundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"POS实际支付总额", FormatUtil.intShrink100ToStr(posPay - posRefundTotal)}));
         startRows += 1;
 
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{"医保支付", FormatUtil.intShrink100ToStr(medicalInsurancePay)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{"医保退款总额", FormatUtil.intShrink100ToStr(medicalInsuranceRefundTotal)}));
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"医保实际支付金额", FormatUtil.intShrink100ToStr(medicalInsurancePay - medicalInsuranceRefundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"医保实际支付总额", FormatUtil.intShrink100ToStr(medicalInsurancePay - medicalInsuranceRefundTotal)}));
         startRows += 1;
 
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{"工行支付", FormatUtil.intShrink100ToStr(icbcPay)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{"工行退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"工行实际支付金额", FormatUtil.intShrink100ToStr(icbcPay - icbcRefundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"工行实际支付总额", FormatUtil.intShrink100ToStr(icbcPay - icbcRefundTotal)}));
 
 
         return customExcelItemList;

src/main/java/com/ywt/mg/services/PrescriptionServices.java

@@ -563,7 +563,7 @@ public class PrescriptionServices {
         List<ExcelCollectPojo> customExcelItemList = new ArrayList<>();
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows , new String[]{"支付总额", FormatUtil.intShrink100ToStr(payTotal)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows , new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows , new String[]{"实际支付金额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows , new String[]{"实际支付总额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
 
 
         if (!Checker.isNone(itemList)) {
@@ -593,7 +593,7 @@ public class PrescriptionServices {
                         int refundAmount = refundList.stream().filter(p -> Checker.getIntegerValue(p.getPaymentChannel()) == paymentChannel).mapToInt(PrescriptionInfo::getTotalPrice).sum();
                         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{paymentChannelName + "支付总额", FormatUtil.intShrink100ToStr(paymentAmount)}));
                         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{paymentChannelName + "退款总额", FormatUtil.intShrink100ToStr(refundAmount)}));
-                        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{paymentChannelName + "实际支付金额", FormatUtil.intShrink100ToStr(paymentAmount - refundAmount)}));
+                        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{paymentChannelName + "实际支付总额", FormatUtil.intShrink100ToStr(paymentAmount - refundAmount)}));
                     }
                 }
             }

src/main/java/com/ywt/mg/services/RegisteredOrderService.java

@@ -582,7 +582,7 @@ public class RegisteredOrderService {
 
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{"支付总额", FormatUtil.intShrink100ToStr(payTotal)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"实际支付金额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"实际支付总额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
         if (!Checker.isNone(itemList)) {
             List<Integer> integerList = itemList.stream().map(RegisteredOrder::getPaymentChannel).collect(Collectors.toList());
             // 去重
@@ -601,7 +601,7 @@ public class RegisteredOrderService {
                         int refundAmount = refundList.stream().filter(p -> Checker.getIntegerValue(p.getPaymentChannel()) == paymentChannel).mapToInt(RegisteredOrder::getTotal).sum();
                         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{paymentChannelName + "支付总额", FormatUtil.intShrink100ToStr(paymentAmount)}));
                         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{paymentChannelName + "退款总额", FormatUtil.intShrink100ToStr(refundAmount)}));
-                        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{paymentChannelName + "实际支付金额", FormatUtil.intShrink100ToStr(paymentAmount - refundAmount)}));
+                        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{paymentChannelName + "实际支付总额", FormatUtil.intShrink100ToStr(paymentAmount - refundAmount)}));
                     }
                 }
             }