Merge branch 'zx_saas_rm_yqpay_0326' of http://git.dayaedu.com/yonge/mec into dev

mec-application/src/main/java/com/ym/mec/teacher/controller/TeacherOrderController.java

@@ -1,16 +1,11 @@
 package com.ym.mec.teacher.controller;
 
 import com.ym.mec.biz.dal.dao.SysConfigDao;
-import com.ym.mec.biz.dal.dao.TenantPaymentOrderDao;
 import com.ym.mec.biz.dal.entity.TenantPaymentOrder;
 import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.TenantPaymentOrderService;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.thirdparty.yqpay.YqPayFeignService;
 import io.swagger.annotations.Api;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

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

@@ -34,7 +34,7 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.adapay.ConfigInit;
 import com.ym.mec.thirdparty.adapay.entity.BaseResult;
-import com.ym.mec.thirdparty.yqpay.*;
+import com.ym.mec.thirdparty.yqpay.DateUtils;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -65,8 +65,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Autowired
     private StudentPaymentOrderDao studentPaymentOrderDao;
-    @Autowired
-    private YqPayFeignService yqPayFeignService;
+//    @Autowired
+//    private YqPayFeignService yqPayFeignService;
     @Autowired
     private StudentRegistrationService studentRegistrationService;
     @Autowired
@@ -270,7 +270,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         //reConfirmOrder(null, null);
     }
 
-    private void yqPayQuery(List<StudentPaymentOrder> payingOrders) throws Exception {
+    /*private void yqPayQuery(List<StudentPaymentOrder> payingOrders) throws Exception {
         if (payingOrders == null) {
             payingOrders = findOrdersByStatus(DealStatusEnum.ING);
         }
@@ -314,7 +314,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             }
             closeOrders(orderNoList); //关闭订单
         }
-    }
+    }*/
 
     private void adaPayQuery(List<StudentPaymentOrder> payingOrders) throws Exception {
         if (payingOrders == null) {
@@ -827,7 +827,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         if (studentPaymentOrder.getPaymentChannel().equals(PaymentChannelEnum.ADAPAY.getCode()) || studentPaymentOrder.getPaymentChannel().equals(PaymentChannelEnum.YEEPAY.getCode())) {
             adaPayQuery(orderList);
         } else if (studentPaymentOrder.getPaymentChannel().equals("YQPAY")) {
-            yqPayQuery(orderList);
+//            yqPayQuery(orderList);
+            throw new BizException("暂不支持易签宝支付");
         }
         return true;
     }

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/yqpay/YqPayFeignService.java

@@ -1,26 +1,9 @@
 package com.ym.mec.thirdparty.yqpay;
 
-import feign.Logger;
-import feign.codec.Encoder;
-import feign.form.spring.SpringFormEncoder;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.support.SpringEncoder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-@FeignClient(value = "YqPayFeignService",url = "https://qyfquery.95epay.com",configuration = YqPayFeignService.FormSupportConfig.class)
+//@FeignClient(value = "YqPayFeignService",url = "https://qyfquery.95epay.com",configuration = YqPayFeignService.FormSupportConfig.class)
 public interface YqPayFeignService {
 
-    @PostMapping(name = "订单查询", value = "/query/trade/tradeQuery",
+   /* @PostMapping(name = "订单查询", value = "/query/trade/tradeQuery",
             consumes = {MediaType.APPLICATION_FORM_URLENCODED_VALUE},
             produces = {MediaType.APPLICATION_JSON_UTF8_VALUE}
     )
@@ -49,5 +32,5 @@ public interface YqPayFeignService {
             return Logger.Level.FULL;
         }
     }
-
+*/
     }