feature:处方下载优化

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

@@ -3,6 +3,7 @@ package com.ywt.mg.services;
 import com.ywt.mg.core.utils.Checker;
 import com.ywt.mg.domain.entities.*;
 import com.ywt.mg.domain.mealEntities.UserMealOrderView;
+import com.ywt.mg.domain.models.enums.PaymentChannelEnum;
 import com.ywt.mg.domain.models.enums.PaymentStatusEnum;
 import com.ywt.mg.domain.models.nutrimeal.MealOrderInfo;
 import com.ywt.mg.domain.ywtDrugEntities.PrescriptionInfo;
@@ -225,4 +226,18 @@ public class OrderPaymentService extends ServiceBase {
         List<Integer> orderIds = prescriptionInfoList.stream().map(PrescriptionInfo::getOrderId).collect(Collectors.toList());
         return getOrderPaymentListByOrderIds(orderIds);
     }
+
+    public String getTransactionIdByOrderIdAndPaymentChannel(List<OrderPayment> orderPaymentList, int orderId, int paymentChannel) {
+        if (!Checker.isNone(orderPaymentList) && orderId > 0) {
+            OrderPayment orderPayment = orderPaymentList.stream().filter(o -> Checker.getIntegerValue(o.getOrderId()) == orderId).findFirst().orElse(null);
+            if (orderPayment != null && (!Checker.isNone(orderPayment.getTransactionId()) || !Checker.isNone(orderPayment.getAlipayTradeNo()))) {
+                if(paymentChannel == PaymentChannelEnum.AliPay.getValue()){
+                    return Checker.getStringValue(orderPayment.getAlipayTradeNo());
+                }
+
+                return orderPayment.getTransactionId();
+            }
+        }
+        return "";
+    }
 }

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

@@ -353,6 +353,7 @@ public class PrescriptionServices {
         try {
             String col0 = "订单号";
             String col1 = "支付流水号";
+            String col20 = "交易流水号";
             String col2 = "取药方式";
             String col3 = "医生姓名";
             String col4 = "患者姓名";
@@ -372,7 +373,7 @@ public class PrescriptionServices {
             String col17 = "作废状态";
             String col18 = "作废备注";
 
-            String[] columns = new String[]{col0, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col19,
+            String[] columns = new String[]{col0, col1, col20, col2, col3, col4, col5, col6, col7, col8, col9, col10, col19,
                     col11, col12, col13, col14, col15, col16, col17, col18};
             int payTotal = 0, refundTotal = 0, realTotal = 0,
                     weChatPay = 0, weChatRefundTotal = 0, weChatRealTotal = 0,
@@ -386,6 +387,7 @@ public class PrescriptionServices {
             List<PrescriptionInfo> prescriptionInfoList = downloadPrescriptionlistNew(request);
             ExcelDataMap map = new ExcelDataMap(columns);
             if (!Checker.isNone(prescriptionInfoList)) {
+                List<OrderPayment> orderPaymentList = orderPaymentService.getOrderPaymentListByPrescriptionInfoList(prescriptionInfoList);
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
                 Map<Integer, Pharmacy> pharmacyMap = pharmacyCacheService.getPharmacyMap();
@@ -394,6 +396,8 @@ public class PrescriptionServices {
                     map.getStringListSafely(col0).add(p.getOrderNo());
                     map.getStringListSafely(col1).add(p.getPaymentNo());
                     int deliveryMethodInt = Checker.getIntegerValue(p.getDeliveryMethod());
+                    String transactionId = orderPaymentService.getTransactionIdByOrderIdAndPaymentChannel(orderPaymentList, Checker.getIntegerValue(p.getOrderId()), p.getPaymentChannel());
+                    map.getStringListSafely(col20).add(transactionId);
                     String deliveryMethodStr =  getAdverDeliveryMethodStr(deliveryMethodInt);
                     map.getStringListSafely(col2).add(deliveryMethodStr);
                     map.getStringListSafely(col3).add(p.getDoctorName());
@@ -610,6 +614,9 @@ public class PrescriptionServices {
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{"药店POS机", FormatUtil.intShrink100ToStr(pharmacyPosPay)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{"药店POS机退款总额", FormatUtil.intShrink100ToStr(pharmacyPosRefundTotal)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"药店POS机实际支付金额", FormatUtil.intShrink100ToStr(pharmacyPosPay - pharmacyPosRefundTotal)}));
+        startRows += 1;
+
+
         return customExcelItemList;
     }
 
@@ -935,7 +942,17 @@ public class PrescriptionServices {
             request.setPaymentChannel(PaymentChannelEnum.WeChat.getValue() + "");
             List<PrescriptionInfo> prescriptionInfoList = downloadPrescriptionlistNew(request);
             ExcelDataMap map = new ExcelDataMap(columns);
+            int payTotal = 0, refundTotal = 0, realTotal = 0,
+                    weChatPay = 0, weChatRefundTotal = 0, weChatRealTotal = 0,
+                    aliPay = 0, aliRefundTotal = 0, aliRealTotal = 0,
+                    cashPay = 0, cashRefundTotal = 0, cashRealTotal = 0,
+                    medicalCardPay = 0, medicalCardRefundTotal = 0, medicalCardRealTotal = 0,
+                    posPay = 0, posRefundTotal = 0, posRealTotal = 0,
+                    medicalInsurancePay = 0, medicalInsuranceRefundTotal = 0, medicalInsuranceRealTotal = 0,
+                    icbcPay = 0, icbcRefundTotal = 0, icbcRealTotal = 0,
+                    pharmacyPosPay = 0, pharmacyPosRefundTotal = 0, pharmacyPosTotal = 0;
             if (!Checker.isNone(prescriptionInfoList)) {
+
                 // 得到支付的记录日志（需要从 order_payment 获取 transaction_id 字段）
                 List<OrderPayment> orderPaymentList = orderPaymentService.getOrderPaymentListByPrescriptionInfoList(prescriptionInfoList);
                 // 得到退款的记录日志（需要从 refund_log 获取 refund_id 字段）
@@ -1001,10 +1018,64 @@ public class PrescriptionServices {
                             map.getStringListSafely(col5).add(typeName);
                         }
                     }
+
+                    //统计支付总额和退费总额
+                    int paymentStatusInt = Checker.getIntegerValue(p.getPaymentStatus());
+                    int presStatus = Checker.getIntegerValue(p.getStatus());
+                    int payChanelInt = Checker.getIntegerValue(p.getPaymentChannel());
+
+                    if (presStatus == PrescriptionInfoStatusEnum.HaveARefund.getValue()) {
+                        refundTotal += Checker.getIntegerValue(p.getTotalPrice());
+
+                        if (payChanelInt == PresPaymentChannelEnum.WeChat.getValue()) {
+                            weChatRefundTotal += Checker.getIntegerValue(p.getTotalPrice());
+                        } else if (payChanelInt == PresPaymentChannelEnum.AliPay.getValue()) {
+                            aliRefundTotal += Checker.getIntegerValue(p.getTotalPrice());
+                        } else if (payChanelInt == PresPaymentChannelEnum.Cash.getValue()) {
+                            cashRefundTotal += Checker.getIntegerValue(p.getTotalPrice());
+                        } else if (payChanelInt == PresPaymentChannelEnum.MedicalCard.getValue()) {
+                            medicalCardRefundTotal += Checker.getIntegerValue(p.getTotalPrice());
+                        } else if (payChanelInt == PresPaymentChannelEnum.POS.getValue()) {
+                            posRefundTotal += Checker.getIntegerValue(p.getTotalPrice());
+                        } else if (payChanelInt == PresPaymentChannelEnum.MedicalInsurance.getValue()) {
+                            medicalInsuranceRefundTotal += Checker.getIntegerValue(p.getTotalPrice());
+                        } else if (payChanelInt == PresPaymentChannelEnum.ICBC.getValue()) {
+                            icbcRefundTotal += Checker.getIntegerValue(p.getTotalPrice());
+                        } else if (payChanelInt == PresPaymentChannelEnum.PharmacyPOS.getValue()) {
+                            pharmacyPosRefundTotal += Checker.getIntegerValue(p.getTotalPrice());
+                        }
+                    }
+                    if (paymentStatusInt == PaymentStatusEnum.Success.getValue()) {
+                        payTotal += Checker.getIntegerValue(p.getTotalPrice());
+
+                        if (payChanelInt == PresPaymentChannelEnum.WeChat.getValue()) {
+                            weChatPay += Checker.getIntegerValue(p.getTotalPrice());
+                        } else if (payChanelInt == PresPaymentChannelEnum.AliPay.getValue()) {
+                            aliPay += Checker.getIntegerValue(p.getTotalPrice());
+                        } else if (payChanelInt == PresPaymentChannelEnum.Cash.getValue()) {
+                            cashPay += Checker.getIntegerValue(p.getTotalPrice());
+                        } else if (payChanelInt == PresPaymentChannelEnum.MedicalCard.getValue()) {
+                            medicalCardPay += Checker.getIntegerValue(p.getTotalPrice());
+                        } else if (payChanelInt == PresPaymentChannelEnum.POS.getValue()) {
+                            posPay += Checker.getIntegerValue(p.getTotalPrice());
+                        } else if (payChanelInt == PresPaymentChannelEnum.MedicalInsurance.getValue()) {
+                            medicalInsurancePay += Checker.getIntegerValue(p.getTotalPrice());
+                        } else if (payChanelInt == PresPaymentChannelEnum.ICBC.getValue()) {
+                            icbcPay += Checker.getIntegerValue(p.getTotalPrice());
+                        } else if (payChanelInt == PresPaymentChannelEnum.PharmacyPOS.getValue()) {
+                            pharmacyPosPay += Checker.getIntegerValue(p.getTotalPrice());
+                        }
+                    }
                 }
             }
             int size = prescriptionInfoList.size();
-            List<ExcelCollectPojo> itemList = new ArrayList<>();
+            List<ExcelCollectPojo> itemList = getStatisticsData(size, payTotal, refundTotal, weChatPay, weChatRefundTotal,
+                    aliPay, aliRefundTotal,
+                    cashPay, cashRefundTotal,
+                    medicalCardPay, medicalCardRefundTotal,
+                    posPay, posRefundTotal,
+                    medicalInsurancePay, medicalInsuranceRefundTotal,
+                    icbcPay, icbcRefundTotal, pharmacyPosPay, pharmacyPosRefundTotal);
             downloadRecordService.createFileAndUploadOssAndSaveToDataBase(fileName, downloadRecordId, map, itemList, size);
         } catch (Exception e) {
             e.printStackTrace();
@@ -1022,6 +1093,7 @@ public class PrescriptionServices {
         try {
             String col0 = "订单号";
             String col1 = "支付流水号";
+            String col20 = "交易流水号";
             String col2 = "取药方式";
             String col3 = "医生姓名";
             String col4 = "患者姓名";
@@ -1040,7 +1112,7 @@ public class PrescriptionServices {
             String col17 = "作废状态";
             String col18 = "作废备注";
 
-            String[] columns = new String[]{col0, col1, col2, col3, col4, col6, col7, col8, col9, col10,
+            String[] columns = new String[]{col0, col1, col20,  col2, col3, col4, col6, col7, col8, col9, col10,
                     col11, col12, col13, col14, col15, col16, col17, col18};
             int payTotal = 0, refundTotal = 0, realTotal = 0,
                     weChatPay = 0, weChatRefundTotal = 0, weChatRealTotal = 0,
@@ -1054,6 +1126,7 @@ public class PrescriptionServices {
             List<PrescriptionInfo> prescriptionInfoList = queryAbverPrescriptionListNew(request);
             ExcelDataMap map = new ExcelDataMap(columns);
             if (!Checker.isNone(prescriptionInfoList)) {
+                List<OrderPayment> orderPaymentList = orderPaymentService.getOrderPaymentListByPrescriptionInfoList(prescriptionInfoList);
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
                 Map<Integer, Pharmacy> pharmacyMap = pharmacyCacheService.getPharmacyMap();
@@ -1063,6 +1136,8 @@ public class PrescriptionServices {
                     map.getStringListSafely(col1).add(p.getPaymentNo());
                     int deliveryMethodInt = Checker.getIntegerValue(p.getDeliveryMethod());
                     String deliveryMethodStr =  getAdverDeliveryMethodStr(deliveryMethodInt);
+                    String transactionId = orderPaymentService.getTransactionIdByOrderIdAndPaymentChannel(orderPaymentList, Checker.getIntegerValue(p.getOrderId()), p.getPaymentChannel());
+                    map.getStringListSafely(col20).add(transactionId);
                     map.getStringListSafely(col2).add(deliveryMethodStr);
                     map.getStringListSafely(col3).add(p.getDoctorName());
                     map.getStringListSafely(col4).add(p.getPatientName());
@@ -1470,6 +1545,15 @@ public class PrescriptionServices {
             String[] columns = new String[]{col0, col1, col2, col3, col4, col5, col6, col7, col8};
             List<PrescriptionDrugView> list = getAdverPrescriptionDrugView(request);
             ExcelDataMap map = new ExcelDataMap(columns);
+            int payTotal = 0, refundTotal = 0, realTotal = 0,
+                    weChatPay = 0, weChatRefundTotal = 0, weChatRealTotal = 0,
+                    aliPay = 0, aliRefundTotal = 0, aliRealTotal = 0,
+                    cashPay = 0, cashRefundTotal = 0, cashRealTotal = 0,
+                    medicalCardPay = 0, medicalCardRefundTotal = 0, medicalCardRealTotal = 0,
+                    posPay = 0, posRefundTotal = 0, posRealTotal = 0,
+                    medicalInsurancePay = 0, medicalInsuranceRefundTotal = 0, medicalInsuranceRealTotal = 0,
+                    icbcPay = 0, icbcRefundTotal = 0, icbcRealTotal = 0,
+                    pharmacyPosPay = 0, pharmacyPosRefundTotal = 0, pharmacyPosTotal = 0;
             if (!Checker.isNone(list)) {
                 Map<Integer, Pharmacy> ma = pharmacyCacheService.getPharmacyMap();
                 for (PrescriptionDrugView d : list) {