全部模块:用户接口

pdf-office-account/src/main/java/cn/kdan/cloud/pdf/office/account/controller/UserController.java

@@ -4,6 +4,8 @@ import cn.kdan.cloud.pdf.office.account.vo.UserDetailVO;
 import cn.kdan.cloud.pdf.office.account.vo.UserPageVO;
 import cn.kdan.cloud.pdf.office.api.account.dto.PermissionGiftDTO;
 import cn.kdan.cloud.pdf.office.api.account.dto.PermissionTransferDTO;
+import cn.kdan.cloud.pdf.office.api.account.dto.UpdateUserForPaySuccessDTO;
+import cn.kdan.cloud.pdf.office.api.account.dto.UpdateUserForRefundDTO;
 import cn.kdan.cloud.pdf.office.common.constant.CommonConstant;
 import cn.kdan.cloud.pdf.office.common.dto.UserRegisterDTO;
 import cn.kdan.cloud.pdf.office.common.pojo.ResultMap;
@@ -129,4 +131,25 @@ public class UserController {
         return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS,Boolean.TRUE);
     }
 
+    /**
+     * 支付成功之后修改用户状态
+     *
+     * @param updateUserForPaySuccessDTO dto
+     */
+    @PostMapping("/updateUserForPaySuccess")
+    public ResultMap<Boolean> updateUserForPaySuccess(@RequestBody UpdateUserForPaySuccessDTO updateUserForPaySuccessDTO) {
+        userService.updateUserForPaySuccess(updateUserForPaySuccessDTO);
+        return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS,Boolean.TRUE);
+    }
+    /**
+     * 退款成功之后修改用户状态
+     *
+     * @param updateUserForRefundDTO dto
+     */
+    @PostMapping("/updateUserForRefund")
+    public ResultMap<Boolean> updateUserForRefund(@RequestBody UpdateUserForRefundDTO updateUserForRefundDTO) {
+        userService.updateUserForRefund(updateUserForRefundDTO);
+        return new ResultMap<>(CommonConstant.SUCCESS, CommonConstant.RESULT_SUCCESS,Boolean.TRUE);
+    }
+
 }

pdf-office-account/src/main/java/cn/kdan/cloud/pdf/office/account/service/UserService.java

@@ -4,6 +4,8 @@ import cn.kdan.cloud.pdf.office.account.vo.UserDetailVO;
 import cn.kdan.cloud.pdf.office.account.vo.UserPageVO;
 import cn.kdan.cloud.pdf.office.api.account.dto.PermissionGiftDTO;
 import cn.kdan.cloud.pdf.office.api.account.dto.PermissionTransferDTO;
+import cn.kdan.cloud.pdf.office.api.account.dto.UpdateUserForPaySuccessDTO;
+import cn.kdan.cloud.pdf.office.api.account.dto.UpdateUserForRefundDTO;
 import cn.kdan.cloud.pdf.office.common.dto.UserRegisterDTO;
 import cn.kdan.cloud.pdf.office.common.utils.BeanConverter;
 import cn.kdan.cloud.pdf.office.common.vo.UserInfoVO;
@@ -79,6 +81,20 @@ public interface UserService {
      */
     UserDetailVO detail(String userId);
 
+    /**
+     * 支付成功之后修改用户状态
+     *
+     * @param updateUserForPaySuccessDTO dto
+     */
+    void updateUserForPaySuccess(UpdateUserForPaySuccessDTO updateUserForPaySuccessDTO);
+
+    /**
+     * 退款成功之后修改用户状态
+     *
+     * @param updateUserForRefundDTO dto
+     */
+    void updateUserForRefund(UpdateUserForRefundDTO updateUserForRefundDTO);
+
     /**
      * 注册用户
      *

pdf-office-account/src/main/java/cn/kdan/cloud/pdf/office/account/service/impl/UserServiceImpl.java

@@ -8,6 +8,8 @@ import cn.kdan.cloud.pdf.office.account.vo.UserDetailVO;
 import cn.kdan.cloud.pdf.office.account.vo.UserPageVO;
 import cn.kdan.cloud.pdf.office.api.account.dto.PermissionGiftDTO;
 import cn.kdan.cloud.pdf.office.api.account.dto.PermissionTransferDTO;
+import cn.kdan.cloud.pdf.office.api.account.dto.UpdateUserForPaySuccessDTO;
+import cn.kdan.cloud.pdf.office.api.account.dto.UpdateUserForRefundDTO;
 import cn.kdan.cloud.pdf.office.common.constant.CommonConstant;
 import cn.kdan.cloud.pdf.office.common.dto.UserRegisterDTO;
 import cn.kdan.cloud.pdf.office.common.enums.EmailCodeTypeEnum;
@@ -113,16 +115,17 @@ public class UserServiceImpl implements UserService {
         return detailVO;
     }
 
-
-    public void updateUserForPaySuccess(String userId,String payTpe,String memberType) {
+    @Override
+    public void updateUserForPaySuccess(UpdateUserForPaySuccessDTO updateUserForPaySuccessDTO) {
         //支付成功之后修改用户状态
-        User user = userMapper.selectByPrimaryKey(userId);
+        User user = userMapper.selectByPrimaryKey(updateUserForPaySuccessDTO.getUserId());
         //通过用户可以查到对应的app
         user.setUpdatedAt(new Date());
         //账号类型 付费账号1 免费账号0 AccountTypeEnum
         user.setAccountType(AccountTypeEnum.PAID_ACCOUNT.value());
         //付费类型 0 试用 1单次购买 2订阅 3单次购买+订阅 4买断 PaidTypeEnum
         user.setPayType(null);
+        user.setMemberType(updateUserForPaySuccessDTO.getMemberType());
         //0已注销（1订阅中2订阅过期3试用中4试用过期）PDFOfficeUserStatusEnum
         //用户如果在订阅中 然后给用户赠送了试用，那么状态还是订阅中（根据付费类型和当前状态来判断）
 
@@ -130,9 +133,10 @@ public class UserServiceImpl implements UserService {
         userMapper.updateByPrimaryKey(user);
     }
 
-    public void updateUserForRefund(String userId,String paidType,String userStatus,String MemberType) {
+    @Override
+    public void updateUserForRefund(UpdateUserForRefundDTO updateUserForRefundDTO) {
         //退单之后修改用户状态
-        User user = userMapper.selectByPrimaryKey(userId);
+        User user = userMapper.selectByPrimaryKey(updateUserForRefundDTO.getUserId());
         user.setUpdatedAt(new Date());
         // 推线账号类型 付费账号1 免费账号0 AccountTypeEnum
         // user.setAccountType(AccountTypeEnum.PAID_ACCOUNT.value());

pdf-office-api/pdf-office-api-account/src/main/java/cn/kdan/cloud/pdf/office/api/account/dto/UpdateUserForPaySuccessDTO.java

@@ -0,0 +1,21 @@
+package cn.kdan.cloud.pdf.office.api.account.dto;
+
+import lombok.Data;
+
+/**
+ * @author tangxiangan
+ */
+@Data
+public class UpdateUserForPaySuccessDTO {
+
+    private String userId;
+    /**
+     * 付费类型 0 试用 1单次购买 2订阅 3单次购买+订阅 4买断 PaidTypeEnum
+     */
+    private Integer payTpe;
+    /**
+     * MemberTypeEnum  mac会员 1 windows会员 2 mac+window会员3
+     */
+    private Integer memberType;
+
+}

pdf-office-api/pdf-office-api-account/src/main/java/cn/kdan/cloud/pdf/office/api/account/dto/UpdateUserForRefundDTO.java

@@ -0,0 +1,21 @@
+package cn.kdan.cloud.pdf.office.api.account.dto;
+
+import lombok.Data;
+
+/**
+ * @author tangxiangan
+ */
+@Data
+public class UpdateUserForRefundDTO {
+
+    private String userId;
+    /**
+     * 0已注销（1订阅中2订阅过期3试用中4试用过期）PDFOfficeUserStatusEnum
+     */
+    private Integer userStatus;
+    /**
+     * MemberTypeEnum  mac会员 1 windows会员 2 mac+window会员3
+     */
+    private Integer memberType;
+
+}

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

@@ -1,5 +1,9 @@
 package cn.kdan.cloud.pdf.office.api.account.feign;
 
+import cn.kdan.cloud.pdf.office.api.account.dto.PermissionGiftDTO;
+import cn.kdan.cloud.pdf.office.api.account.dto.PermissionTransferDTO;
+import cn.kdan.cloud.pdf.office.api.account.dto.UpdateUserForPaySuccessDTO;
+import cn.kdan.cloud.pdf.office.api.account.dto.UpdateUserForRefundDTO;
 import cn.kdan.cloud.pdf.office.api.account.feign.hystrix.UserHystrix;
 import cn.kdan.cloud.pdf.office.common.constant.CommonConstant;
 import cn.kdan.cloud.pdf.office.common.dto.UserRegisterDTO;
@@ -31,5 +35,19 @@ public interface UserApi {
     @PostMapping(value = "register")
     ResultMap<Boolean> register(@RequestBody UserRegisterDTO userRegisterDTO);
 
-
+    /**
+     * 支付成功之后修改用户状态
+     *
+     * @param updateUserForPaySuccessDTO dto
+     */
+    @PostMapping(value = "updateUserForPaySuccess")
+    ResultMap<Boolean> updateUserForPaySuccess(@RequestBody UpdateUserForPaySuccessDTO updateUserForPaySuccessDTO);
+
+    /**
+     * 退款成功之后修改用户状态
+     *
+     * @param updateUserForRefundDTO dto
+     */
+    @PostMapping(value = "updateUserForRefund")
+    ResultMap<Boolean> updateUserForRefund(@RequestBody UpdateUserForRefundDTO updateUserForRefundDTO);
 }

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

@@ -1,6 +1,8 @@
 package cn.kdan.cloud.pdf.office.api.account.feign.hystrix;
 
 
+import cn.kdan.cloud.pdf.office.api.account.dto.UpdateUserForPaySuccessDTO;
+import cn.kdan.cloud.pdf.office.api.account.dto.UpdateUserForRefundDTO;
 import cn.kdan.cloud.pdf.office.api.account.feign.UserApi;
 import cn.kdan.cloud.pdf.office.common.constant.CommonConstant;
 import cn.kdan.cloud.pdf.office.common.dto.UserRegisterDTO;
@@ -30,4 +32,14 @@ public class UserHystrix implements UserApi {
         return new ResultMap<>(CommonConstant.ERROR, CommonConstant.RESULT_ERROR_SERVICE_NOT_AVAILABLE);
     }
 
+    @Override
+    public ResultMap<Boolean> updateUserForPaySuccess(UpdateUserForPaySuccessDTO updateUserForPaySuccessDTO) {
+        return new ResultMap<>(CommonConstant.ERROR, CommonConstant.RESULT_ERROR_SERVICE_NOT_AVAILABLE);
+    }
+
+    @Override
+    public ResultMap<Boolean> updateUserForRefund(UpdateUserForRefundDTO updateUserForRefundDTO) {
+        return new ResultMap<>(CommonConstant.ERROR, CommonConstant.RESULT_ERROR_SERVICE_NOT_AVAILABLE);
+    }
+
 }

pdf-office-common/src/main/java/cn/kdan/cloud/pdf/office/common/enums/account/MemberTypeEnum.java

@@ -7,7 +7,7 @@ package cn.kdan.cloud.pdf.office.common.enums.account;
 public enum MemberTypeEnum {
 
     /**
-     * mac会员
+     * mac会员 1 windows会员 2 mac+window会员3
      */
     MAC_MEMBER(1),
     /**