ias 订单状态查询支付信息返回

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/OrderStatusQueryManager.java

@@ -4,6 +4,7 @@ import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.pub.TimeTools;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.core.entity.dict.issue.IssueOrderStep;
+import cn.com.taiji.core.entity.dict.issue.OrderPayStatus;
 import cn.com.taiji.core.entity.issue.IssueOrderPay;
 import cn.com.taiji.core.entity.issue.IssueOrderinfo;
 import cn.com.taiji.core.entity.issue.IssueOrderinfoExt;
@@ -64,20 +65,26 @@ public class OrderStatusQueryManager extends AbstractOrderManager<OrderStatusQue
     @Override
     protected AbstractSignTypeResponse getRes(OrderStatusQueryRequest req, ServiceLogEvent event,
         Map<String, Object> dataStream) throws ServiceHandleException {
+        OrderStatusQueryResponse res = new OrderStatusQueryResponse();
         IssueOrderinfo order = (IssueOrderinfo)dataStream.get(ORDER);
 
         List<IssueOrderPay> pays = orderPayRepo.listByOrderNo(order.getOrderNo());
-        List<PayInfoModel> payInfoList = pays.stream().map(pay -> {
-            PayInfoModel payInfoModel = new PayInfoModel();
-            if (pay.getPayTime()!=null) {
-                payInfoModel.setPayTime(pay.getPayTime().format(TimeTools.ISO_LOCAL_DATE_TIME));
+        if (!isEmpty(pays)){
+            List<OrderPayStatus> list = pays.stream().map(IssueOrderPay::getPayStatus).collect(Collectors.toList());
+            boolean b = list.stream().allMatch(t -> t == OrderPayStatus.SUCCESS);
+            if (b) {
+                //全部支付成功，返回支付信息
+                List<PayInfoModel> payInfoList = pays.stream().map(pay -> {
+                    PayInfoModel payInfoModel = new PayInfoModel();
+                    payInfoModel.setPayTime(pay.getPayTime().format(TimeTools.ISO_LOCAL_DATE_TIME));
+                    payInfoModel.setPayOrderNo(pay.getPayOrderNo());
+                    payInfoModel.setExternalOrderNo(pay.getExternalOrderNo());
+                    payInfoModel.setFee(pay.getFee());
+                    return payInfoModel;
+                }).collect(Collectors.toList());
+                res.setPayInfoList(payInfoList);
             }
-            payInfoModel.setPayOrderNo(pay.getExternalOrderNo());
-            payInfoModel.setFee(pay.getFee());
-            return payInfoModel;
-        }).collect(Collectors.toList());
-        OrderStatusQueryResponse res = new OrderStatusQueryResponse();
-        res.setPayInfoList(payInfoList);
+        }
         res.setOrderStep(order.getOrderStep().getCode());
         res.setOrderStatus(order.getOrderStatus().getCode());
         res.setCustomerName(order.getCustomerName());