core payTools

gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/issue/PayTools.java

@@ -81,8 +81,8 @@ public class PayTools extends AbstractManager {
      * @return true:支付完成 false:未支付
      * @throws ServiceHandleException
      */
-    public Boolean queryPay(String orderNo) throws ServiceHandleException {
-        List<IssueOrderPay> issueOrderPays = paymentDetections(orderNo);
+    public Boolean queryPay(String orderNo,OrderType orderType) throws ServiceHandleException {
+        List<IssueOrderPay> issueOrderPays = paymentDetections(orderNo,orderType);
         if (isEmpty(issueOrderPays)) {
             return true;
         }else {
@@ -139,11 +139,12 @@ public class PayTools extends AbstractManager {
     /**
      * 支付查询
      * @param orderNo 订单号
+     * @param orderType 订单类型(发行、售后）
      * @return 支付单
      * @throws ServiceHandleException
      */
-    public List<IssueOrderPay> paymentDetections(String orderNo) throws ServiceHandleException {
-        List<IssueOrderPay> pays = orderPayRepo.listByOrderNo(orderNo);
+    public List<IssueOrderPay> paymentDetections(String orderNo,OrderType orderType) throws ServiceHandleException {
+        List<IssueOrderPay> pays = orderPayRepo.listByOrderNo(orderNo,orderType);
         if (isEmpty(pays)) {
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("订单支付信息不存在");
         }

gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/issue/QdCallUtil.java

@@ -67,7 +67,7 @@ public class QdCallUtil extends CommonAbstract {
         if (order.getActivationTime() != null){
             callbackModel.setActiveTime(order.getActivationTime().format(TimeTools.ISO_LOCAL_DATE_TIME));
         }
-        List<IssueOrderPay> pays = orderPayRepo.listByOrderNo(order.getOrderNo());
+        List<IssueOrderPay> pays = orderPayRepo.listByOrderNo(order.getOrderNo(),OrderType.ISSUE);
         List<OrderPayStatus> list = pays.stream().map(IssueOrderPay::getPayStatus).collect(Collectors.toList());
 
         if (!isEmpty(pays)) {

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/issue/IssueOrderPayRepo.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.core.repo.jpa.issue;
 
 import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
+import cn.com.taiji.core.entity.dict.issue.OrderType;
 import cn.com.taiji.core.entity.issue.IssueOrderPay;
 import org.springframework.data.jpa.repository.Query;
 
@@ -8,8 +9,8 @@ import java.util.List;
 
 public interface IssueOrderPayRepo extends AbstractJpaRepo<IssueOrderPay, String>{
 
-    @Query("from IssueOrderPay where orderNo = ?1 ")
-    List<IssueOrderPay> listByOrderNo(String orderNo);
+    @Query("from IssueOrderPay where orderNo = ?1 and orderType =?2")
+    List<IssueOrderPay> listByOrderNo(String orderNo, OrderType orderType);
 
     @Query(" from IssueOrderPay where payOrderNo = ?1")
     IssueOrderPay findByPayOrderNo(String payOrderNo);