用户模块：获取用户信息接口 用户状态修改接口

pdf-office-api/pdf-office-api-account/src/main/java/cn/kdan/cloud/pdf/office/api/account/feign/UserApi.java

@@ -66,7 +66,7 @@ public interface UserApi {
 
 
     @GetMapping("/page")
-    public ResultMap<PageInfo<UserPageVO>> page(@RequestParam(required = false, defaultValue = "1") Integer page,
+    ResultMap<PageInfo<UserPageVO>> page(@RequestParam(required = false, defaultValue = "1") Integer page,
                                                 @RequestParam(required = false, defaultValue = "10") Integer pageSize,
                                                 @RequestParam(required = false) String selectType,
                                                 @RequestParam(required = false) List<String> appIds,
@@ -85,7 +85,7 @@ public interface UserApi {
      * @return ResultMap
      */
     @GetMapping("/detail")
-    ResultMap<UserDetailVO> detail(@RequestParam String userId);
+    ResultMap<UserDetailVO> detail(@RequestParam("userId") String userId);
 
 
     /**

pdf-office-api/pdf-office-api-payment/src/main/java/cn/kdan/cloud/pdf/office/api/payment/feign/SubscriptionApi.java

@@ -59,7 +59,7 @@ public interface SubscriptionApi {
      * @return SubscriptionSchemeVO
      */
     @GetMapping("/getSubscriptionSchemeInfo")
-    ResultMap<SubscriptionSchemeVO> getSubscriptionSchemeInfo(@NotNull(message = "用户id不能为空")@RequestParam String userId,
-                                                              @NotNull(message = "platform不能为空")@RequestParam Integer platform);
+    ResultMap<SubscriptionSchemeVO> getSubscriptionSchemeInfo(@NotNull(message = "用户id不能为空")@RequestParam("userId") String userId,
+                                                              @NotNull(message = "platform不能为空")@RequestParam("platform") Integer platform);
 
 }

pdf-office-api/pdf-office-api-product/src/main/java/cn/kdan/cloud/pdf/office/api/product/feign/ProductApi.java

@@ -29,7 +29,7 @@ public interface ProductApi {
 
 
     @GetMapping("/getProductList")
-    ResultMap<IPage<ProductVO>> getProductList(@RequestParam Long size, @RequestParam Long page,
-                                               @RequestParam String appId);
+    ResultMap<IPage<ProductVO>> getProductList(@RequestParam("size") Long size, @RequestParam("page") Long page,
+                                               @RequestParam("appId") String appId);
 
 }

pdf-office-email/src/test/java/cn/kdan/cloud/pdf/office/email/SendEmailTest.java

@@ -25,8 +25,6 @@ public class SendEmailTest {
     public void sendTest(){
         EmailSendBO emailSendBO = new EmailSendBO();
         emailSendBO.setToEmail("ddfme123@163.com");
-        emailSendBO.setEmailTitle("123");
-        emailSendBO.setTemplateId("1");
         Map<String,String> map = new HashMap<>();
         map.put("@username@","wph");
         emailSendBO.setSendContent(map);

pdf-office-payment/src/main/java/cn/kdan/cloud/pdf/office/payment/listener/PaymentListener.java

@@ -1,14 +1,12 @@
 package cn.kdan.cloud.pdf.office.payment.listener;
 
-import cn.kdan.cloud.pdf.office.api.account.dto.UpdateUserForPaySuccessDTO;
+import cn.kdan.cloud.pdf.office.api.account.dto.UpdateUserForOrderDTO;
 import cn.kdan.cloud.pdf.office.api.account.feign.UserApi;
 import cn.kdan.cloud.pdf.office.api.payment.vo.SubscriptionsVO;
 import cn.kdan.cloud.pdf.office.api.product.enums.PlatformEnum;
-import cn.kdan.cloud.pdf.office.api.product.feign.ProductApi;
 import cn.kdan.cloud.pdf.office.common.constant.RabbitMqConstant;
 import cn.kdan.cloud.pdf.office.common.enums.account.PDFOfficeUserStatusEnum;
 import cn.kdan.cloud.pdf.office.common.utils.MyDateUtils;
-import cn.kdan.cloud.pdf.office.common.vo.UserInfoVO;
 import cn.kdan.cloud.pdf.office.payment.service.OrdersService;
 import cn.kdan.cloud.pdf.office.payment.service.SubscriptionsService;
 import com.rabbitmq.client.Channel;
@@ -76,8 +74,8 @@ public class PaymentListener {
                 String validFlag = userApi.getById(subscription.getUserId()).getResult().getValidFlag();
                 PDFOfficeUserStatusEnum userStatusEnum = PDFOfficeUserStatusEnum.getEnumByValue(validFlag);
                 // TODO 修改用户状态
-                UpdateUserForPaySuccessDTO paySuccessDTO = new UpdateUserForPaySuccessDTO();
-                userApi.updateUserForPaySuccess(paySuccessDTO);
+                UpdateUserForOrderDTO paySuccessDTO = new UpdateUserForOrderDTO();
+                userApi.updateUserForOrder(paySuccessDTO);
             }
             channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
             log.info("订阅过期 处理成功 :{}", subscriptionId);

pdf-office-pdf-website/pom.xml

@@ -16,6 +16,7 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
+    <url>http://maven.apache.org</url>
 
     <dependencies>
         <dependency>
@@ -186,4 +187,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>