fix 修改接口

src/main/java/com/ywt/mg/domain/models/enums/PaymentChannelEnum.java

@@ -13,6 +13,7 @@ public enum PaymentChannelEnum {
     MedicalInsurance("医保", 7),
     ICBC("工行", 8),
     PharmacyPOS("药店pos机", 9),
+    PharmacyUnion("门店聚合", 10),
     UNKNOWN("", 0);
 
     private final String displayName;
@@ -41,5 +42,16 @@ public enum PaymentChannelEnum {
         return "";
     }
 
+    public static int getDisplayValue(String name) {
+        if (name == null || name.trim().equals("")) {
+            return 0;
+        }
+        for (PaymentChannelEnum enumValue : PaymentChannelEnum.values()) {
+            if (name.equals(enumValue.displayName)) {
+                return enumValue.value;
+            }
+        }
+        return 0;
+    }
 
 }

src/main/java/com/ywt/mg/domain/models/enums/PresPaymentChannelEnum.java

@@ -11,6 +11,7 @@ public enum PresPaymentChannelEnum {
     MedicalInsurance("医保", 7),
     ICBC("工行", 8),
     PharmacyPOS("药店pos机", 9),
+    PharmacyUnion("门店聚合", 10),
     UNKNOWN("", 0);
 
     private final String displayName;

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

@@ -343,7 +343,8 @@ public class PharmacyService {
                     medicalCardPay = 0, medicalCardRefundTotal = 0, medicalCardRealTotal = 0,
                     posPay = 0, posRefundTotal = 0, posRealTotal = 0,
                     medicalInsurancePay = 0, medicalInsuranceRefundTotal = 0, medicalInsuranceRealTotal = 0,
-                    icbcPay = 0, icbcRefundTotal = 0, icbcRealTotal = 0;
+                    icbcPay = 0, icbcRefundTotal = 0, icbcRealTotal = 0,
+                    pharmacyUnionPay = 0, pharmacyUnionRefundTotal = 0, pharmacyUnionRealTotal = 0;
             List<PrescriptionInfo> list = downloadPrescriptionlist(request);
             ExcelDataMap map = new ExcelDataMap(columns);
             if (!Checker.isNone(list)) {
@@ -442,6 +443,8 @@ public class PharmacyService {
                             medicalInsuranceRefundTotal += Checker.getIntegerValue(p.getTotalPrice());
                         } else if (payChanelInt == PresPaymentChannelEnum.ICBC.getValue()) {
                             icbcRefundTotal += Checker.getIntegerValue(p.getTotalPrice());
+                        } else if (payChanelInt == PresPaymentChannelEnum.PharmacyUnion.getValue()) {
+                            pharmacyUnionRefundTotal += Checker.getIntegerValue(p.getTotalPrice());
                         }
                     }
                     if (paymentStatusInt == PaymentStatusEnum.Success.getValue()) {
@@ -461,6 +464,8 @@ public class PharmacyService {
                             medicalInsurancePay += Checker.getIntegerValue(p.getTotalPrice());
                         } else if (payChanelInt == PresPaymentChannelEnum.ICBC.getValue()) {
                             icbcPay += Checker.getIntegerValue(p.getTotalPrice());
+                        } else if (payChanelInt == PresPaymentChannelEnum.PharmacyUnion.getValue()) {
+                            pharmacyUnionPay += Checker.getIntegerValue(p.getTotalPrice());
                         }
                     }
                 }
@@ -473,7 +478,7 @@ public class PharmacyService {
                     medicalCardPay, medicalCardRefundTotal,
                     posPay, posRefundTotal,
                     medicalInsurancePay, medicalInsuranceRefundTotal,
-                    icbcPay, icbcRefundTotal);
+                    icbcPay, icbcRefundTotal, pharmacyUnionPay, pharmacyUnionRefundTotal);
             int bill = 0;
             downloadRecordService.createFileAndUploadOssAndSaveToDataBase(fileName, downloadRecordId, map, itemList, size, bill);
 
@@ -505,7 +510,7 @@ public class PharmacyService {
                                                      int medicalCardPay, int medicalCardRefundTotal,
                                                      int posPay, int posRefundTotal,
                                                      int medicalInsurancePay, int medicalInsuranceRefundTotal,
-                                                     int icbcPay, int icbcRefundTotal) {
+                                                     int icbcPay, int icbcRefundTotal, int pharmacyUnionPay, int pharmacyUnionRefundTotal) {
         int startRows = size + 3;
         int startColumn = 3;
 
@@ -548,6 +553,11 @@ public class PharmacyService {
         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)}));
+        startRows += 1;
+
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{"门店聚合支付", FormatUtil.intShrink100ToStr(pharmacyUnionPay)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{"门店聚合退款总额", FormatUtil.intShrink100ToStr(pharmacyUnionRefundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"门店聚合实际支付总额", FormatUtil.intShrink100ToStr(pharmacyUnionPay - pharmacyUnionRefundTotal)}));
 
 
         return customExcelItemList;