双十一活动调整

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -1799,7 +1799,26 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             if(hfMerchantConfig == null){
                 throw new BizException("机构[{}]汇付商户信息找不到", order.getTenantId());
             }
-            Map<String, Object> payment = Payment.queryPayment(order.getTransNo(), hfMerchantConfig.getMerKey());
+            Map<String, Object> payment = new HashMap<>();
+            if(StringUtils.equals(order.getPaymentChannel(), PaymentChannelEnum.ADAPAY.getCode())) {
+                payment = Payment.queryPayment(order.getTransNo(), hfMerchantConfig.getMerKey());
+            }else if(StringUtils.equals(order.getPaymentChannel(), PaymentChannelEnum.YEEPAY.getCode())) {
+                Map<String, Object> orderInfo = yeepayPaymentService.queryOrder(hfMerchantConfig, order.getMerNos(), order.getOrderNo());
+                payment.put("pay_channel", orderInfo.get("channel"));
+
+                String respStatus = orderInfo.get("status").toString();
+
+                if(StringUtils.equals("SUCCESS", respStatus)) {
+                    payment.put("status", "succeeded");
+                }else if(StringUtils.equals("FAIL", respStatus) || StringUtils.equals("TIME_OUT", respStatus) || StringUtils.equals("CLOSE", respStatus)) {
+                    payment.put("status", "failed");
+                }else {
+                    payment.put("status", "pending");
+                }
+                payment.put("error_msg", orderInfo.get("failReason"));
+            }else {
+                throw new BizException("[{}]支付渠道不支持", order.getPaymentChannel());
+            }
             LOGGER.info("订单[{}]交易主动查询接口返回：{}", order.getTransNo(), payment);
 
             model.setPayChannel((String) payment.get("pay_channel"));

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -1012,7 +1012,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         } else {
             if ("alipay_qr".equals(payChannel) || "ALIPAY".equals(payChannel) || "alipay_wap".equals(payChannel)) {
                 paySuccess(detail.getId(), 1);
-            } else if ("wx_pub".equals(payChannel) || "WXPay".equals(payChannel) || "wx_app".equals(payChannel)) {
+            } else if ("wx_pub".equals(payChannel) || "WECHAT".equals(payChannel) || "wx_app".equals(payChannel)) {
                 paySuccess(detail.getId(), 2);
             }
         }