core

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

@@ -6,6 +6,7 @@ import cn.com.taiji.common.pub.CommonAbstract;
 import cn.com.taiji.common.pub.TimeTools;
 import cn.com.taiji.common.pub.json.JsonTools;
 import cn.com.taiji.core.entity.ass.AssAgencyConfig;
+import cn.com.taiji.core.entity.dict.issue.OrderPayStatus;
 import cn.com.taiji.core.entity.dict.issue.OrderType;
 import cn.com.taiji.core.entity.issue.IssueOrderChannelNotice;
 import cn.com.taiji.core.entity.issue.IssueOrderPay;
@@ -59,10 +60,14 @@ public class QdCallUtil extends CommonAbstract {
                 .setCardId(order.getCardId())
                 .setObuId(order.getObuId())
                 .setPlateNum(order.getVehiclePlate())
-                .setPlateColor(order.getVehiclePlateColor())
-                .setActiveTime(order.getActivationTime().format(TimeTools.ISO_LOCAL_DATE_TIME));
+                .setPlateColor(order.getVehiclePlateColor());
+        if (order.getActivationTime() != null){
+            callbackModel.setActiveTime(order.getActivationTime().format(TimeTools.ISO_LOCAL_DATE_TIME));
+        }
         List<IssueOrderPay> pays = orderPayRepo.listByOrderNo(order.getOrderNo());
-        if (!isEmpty(pays)) {
+        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));