core 渠道通知工具类

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

@@ -66,16 +66,21 @@ public class QdCallUtil extends CommonAbstract {
         }
         List<IssueOrderPay> pays = orderPayRepo.listByOrderNo(order.getOrderNo());
         List<OrderPayStatus> list = pays.stream().map(IssueOrderPay::getPayStatus).collect(Collectors.toList());
-        boolean b = list.stream().allMatch(t -> t == OrderPayStatus.SUCCESS);
-        if (!isEmpty(pays) && b) {
-            List<PayInfoModelQd> payInfoList = pays.stream().map(pay -> {
-                PayInfoModelQd payInfoModelQd = new PayInfoModelQd();
-                payInfoModelQd.setPayTime(pay.getPayTime().format(TimeTools.ISO_LOCAL_DATE_TIME));
-                payInfoModelQd.setPayOrderNo(pay.getExternalOrderNo());
-                payInfoModelQd.setFee(pay.getFee());
-                return payInfoModelQd;
-            }).collect(Collectors.toList());
-            callbackModel.setPayInfoList(payInfoList);
+
+        if (!isEmpty(pays)) {
+            boolean b = list.stream().allMatch(t -> t == OrderPayStatus.SUCCESS);
+            if (b) {
+                //全部支付成功，返回支付信息
+                List<PayInfoModelQd> payInfoList = pays.stream().map(pay -> {
+                    PayInfoModelQd payInfoModelQd = new PayInfoModelQd();
+                    payInfoModelQd.setPayTime(pay.getPayTime().format(TimeTools.ISO_LOCAL_DATE_TIME));
+                    payInfoModelQd.setPayOrderNo(pay.getPayOrderNo());
+                    payInfoModelQd.setExternalOrderNo(pay.getExternalOrderNo());
+                    payInfoModelQd.setFee(pay.getFee());
+                    return payInfoModelQd;
+                }).collect(Collectors.toList());
+                callbackModel.setPayInfoList(payInfoList);
+            }
         }
         AssAgencyConfig agencyConfig = assAgencyConfigRepo.findByAgencyId(order.getAgencyId());
         if (agencyConfig == null || !hasText(agencyConfig.getNoticeUrl())){

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/model/PayInfoModelQd.java

@@ -8,7 +8,8 @@ import lombok.Setter;
 @Setter
 public class PayInfoModelQd extends BaseModel {
 
-    private String payOrderNo;
+    private String payOrderNo;//商户单号
+    private String externalOrderNo;//交易单号
     private Long fee;
     private String payTime;
 }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/order/PayInfoModel.java

@@ -7,7 +7,8 @@ import lombok.Setter;
 @Getter
 @Setter
 public class PayInfoModel extends BaseModel {
-    private String payOrderNo;
+    private String payOrderNo;//商户单号
+    private String externalOrderNo;//交易单号
     private Long fee;
     private String payTime;
 }