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/OrderServiceImpl.java

@@ -197,7 +197,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
     @Override
     @Transactional
-    @Cacheable(value = RedisKeyConstant.CACHE_PAYMENT_CREAT_ORDER + "#24#h",
+    @Cacheable(value = RedisKeyConstant.CACHE_PAYMENT_CREAT_ORDER + "#2#h",
             key = "T(String).valueOf(#createUserOrderDTO.userId)" +
                     ".concat('-').concat(#createUserOrderDTO.productId)" +
                     ".concat('-').concat(#createUserOrderDTO.paymentMethod)" +
@@ -319,7 +319,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                         RabbitMqConstant.PAYMENT_ORDER_ROUTING_KEY,
                         order.getId(),
                         (msg -> {
-                            msg.getMessageProperties().setHeader("x-delay", (24 * 60 * 60 * 1000) + "");
+                            msg.getMessageProperties().setHeader("x-delay", (2 * 60 * 60 * 1000) + "");
                             return msg;
                         }));
                 Map<String, String> result = new HashMap<>();
@@ -337,7 +337,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
     @Override
     @Transactional
-    @Cacheable(value = RedisKeyConstant.CACHE_PAYMENT_CREAT_ORDER + "#24#h",
+    @Cacheable(value = RedisKeyConstant.CACHE_PAYMENT_CREAT_ORDER + "#2#h",
             key = "T(String).valueOf(#createUserOrderDTO.userId)" +
                     ".concat('-').concat(#createUserOrderDTO.productId)" +
                     ".concat('-').concat(#createUserOrderDTO.paymentMethod)" +
@@ -477,7 +477,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                         RabbitMqConstant.PAYMENT_ORDER_ROUTING_KEY,
                         order.getId(),
                         (msg -> {
-                            msg.getMessageProperties().setHeader("x-delay", (24 * 60 * 60 * 1000) + "");
+                            msg.getMessageProperties().setHeader("x-delay", (2 * 60 * 60 * 1000) + "");
                             return msg;
                         }));
                 Map<String, String> result = new HashMap<>();

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

@@ -312,11 +312,12 @@ public class PayCenterWebhookServiceImpl implements PayCenterWebhookService {
                                 userSubscriptionInfo.setPoint(Integer.valueOf(productVO.getPoints()));
                                 if(productVO.getCode().contains("trail")){
                                     userVO.setCanAccessAi("0");
+                                    userApi.updateUser(userVO);
                                 }
                             } else {
                                 userVO.setAccountType(AccountTypeEnum.PAID_ACCOUNT.value());
+                                userApi.updateUser(userVO);
                             }
-                            userApi.updateUser(userVO);
                             userSubscriptionInfoApi.insert(userSubscriptionInfo);
                             emailFlag = true;
                         }