Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -663,13 +663,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 KylinOrderTickets orderTickets = KylinOrderTickets.getNew();
                 orderTickets.setOrderTicketsId(payAgainParam.getOrderId());
                 orderTickets.setUpdatedAt(LocalDateTime.now());
-                orderTickets.setPayCode(payResultVo.getCode());
+                orderTickets.setPayCode(payResultVo.getData().getCode());
                 orderTickets.setPayType(payAgainParam.getPayType());
 
                 //改vo
                 HashMap<String, Object> map = ObjectUtil.cloneHashMapStringAndObject();
                 map.put("payType", payAgainParam.getPayType());
-                map.put("payCode", payResultVo.getCode());
+                map.put("payCode", payResultVo.getData().getCode());
                 map.put("updatedAt", DateUtil.Formatter.yyyyMMddHHmmss.format(orderTickets.getUpdatedAt()));
                 map.put("changeDate", orderTickets.getUpdatedAt());
                 mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(