3 Commits fadc9c0fab ... aba244cfd6

Autor SHA1 Mensagem Data
  wuyongyi aba244cfd6 feat:处方订单增加工行方法 1 ano atrás
  wuyongyi 8deeeadd3b feat:处方订单增加工行方法 1 ano atrás
  wuyongyi 6b96f11bbf feat:处方订单增加查询方法 1 ano atrás

+ 5 - 3
src/main/java/com/ywt/mg/services/PrescriptionServices.java

@@ -900,7 +900,7 @@ public class PrescriptionServices {
             String col6 = "支付渠道";
             String[] columns = new String[]{col0, col1, col2, col3, col4, col5, col6};
             request.setPaymentStatus(PaymentStatusEnum.Success.getValue() + "");
-            request.setPaymentChannel(PaymentChannelEnum.WeChat.getValue() + "");
+//            request.setPaymentChannel(PaymentChannelEnum.WeChat.getValue() + "");
             List<PrescriptionInfo> prescriptionInfoList = downloadPrescriptionlistNew(request);
             ExcelDataMap map = new ExcelDataMap(columns);
             Map<String, Integer> statisticalDataMap = new HashMap<>();
@@ -914,7 +914,8 @@ public class PrescriptionServices {
                 Date billEndTime = DateUtil.stringToDate(request.getBillEndTime() + ConstantDef.BILL_TIME_END_FORMAT);
                 for (PrescriptionInfo p : prescriptionInfoList) {
                     if (!Checker.isNone(p) && Checker.getIntegerValue(p.getPaymentStatus()) == PaymentStatusEnum.Success.getValue()
-                            && Checker.getIntegerValue(p.getPaymentChannel()) == PaymentChannelEnum.WeChat.getValue()
+                            && (Checker.getIntegerValue(p.getPaymentChannel()) == PaymentChannelEnum.WeChat.getValue()
+                            || Checker.getIntegerValue(p.getPaymentChannel()) == PaymentChannelEnum.ICBC.getValue())
                             && !Checker.isNone(p.getPayTime())) {
                         // "交易类型", "交易流水号", "交易金额", "交易时间", "订单号", "类型"
                         Date paymentTime = Checker.getDateValue(p.getPayTime());
@@ -962,7 +963,8 @@ public class PrescriptionServices {
                 List<PrescriptionInfo> refundPrescriptionInfoList = getRefundPrescriptionInfoList(prescriptionInfoList);
                 // 最后处理退款的部分
                 for (PrescriptionInfo p : refundPrescriptionInfoList) {
-                    if (!Checker.isNone(p) && Checker.getIntegerValue(p.getRefundStatus()) == RefundStatusEnum.SUCCESS.getValue()) {
+                    if (!Checker.isNone(p) && Checker.getIntegerValue(p.getRefundStatus()) == RefundStatusEnum.SUCCESS.getValue() && (Checker.getIntegerValue(p.getPaymentChannel()) == PaymentChannelEnum.WeChat.getValue()
+                            || Checker.getIntegerValue(p.getPaymentChannel()) == PaymentChannelEnum.ICBC.getValue())) {
                         // "交易类型", "交易流水号", "交易金额", "交易时间", "订单号", "类型"
                         Date refundTime = Checker.getDateValue(p.getRefundTime());
                         if (!Checker.isNone(refundTime) && refundTime.after(billStartTime) && refundTime.before(billEndTime)) {