2 Commits 3e7701d8af ... a9154f37f3

Autor SHA1 Mensagem Data
  wuyongyi a9154f37f3 Merge branch 'hotfix' into test 1 ano atrás
  wuyongyi 8deeeadd3b feat:处方订单增加工行方法 1 ano atrás

+ 2 - 1
src/main/java/com/ywt/mg/services/PrescriptionServices.java

@@ -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());