Merge remote-tracking branch 'origin/develop/v1.0' into develop/v1.0

pdf-office-payment/src/main/java/cn/kdan/cloud/pdf/office/payment/service/impl/PayCenterWebhookServiceImpl.java

@@ -422,6 +422,7 @@ public class PayCenterWebhookServiceImpl implements PayCenterWebhookService {
                     Order cycleOrder = new Order();
                     BeanUtil.copyProperties(ordersVOList.get(0), cycleOrder);
                     cycleOrder.setId(CommonUtils.generateId());
+                    cycleOrder.setTradeNo(cn.kdan.cloud.pdf.office.payment.utils.CommonUtils.generateRightsId((long) ((Math.random() * 9999 + 1) * 10000)));
                     cycleOrder.setThirdTradeNo(payId);
                     ordersService.save(cycleOrder);
                     // 通过thirdTradeId更新subscription