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

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

@@ -146,21 +146,11 @@ public class UserController {
     /**
      * 支付成功之后修改用户状态
      *
-     * @param updateUserForPaySuccessDTO dto
+     * @param updateUserForOrderDTO 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);
+    @PostMapping("/updateUserForOrder")
+    public ResultMap<Boolean> updateUserForOrder(@RequestBody UpdateUserForOrderDTO updateUserForOrderDTO) {
+        userService.updateUserForOrder(updateUserForOrderDTO);
         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

@@ -79,18 +79,12 @@ public interface UserService {
     UserDetailVO detail(String userId);
 
     /**
-     * 支付成功之后修改用户状态
+     * 订单成功之后修改用户状态
      *
-     * @param updateUserForPaySuccessDTO dto
+     * @param updateUserForOrderDTO dto
      */
-    void updateUserForPaySuccess(UpdateUserForPaySuccessDTO updateUserForPaySuccessDTO);
+    void updateUserForOrder(UpdateUserForOrderDTO updateUserForOrderDTO);
 
-    /**
-     * 退款成功之后修改用户状态
-     *
-     * @param updateUserForRefundDTO dto
-     */
-    void updateUserForRefund(UpdateUserForRefundDTO updateUserForRefundDTO);
 
     /**
      * 注册用户

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

@@ -12,8 +12,32 @@ public interface UserSubscriptionInfoService {
 
     /**
      * 获取用户的会员情况
+     *
      * @param userId 用户id
      * @return
      */
     List<UserSubscriptionInfo> listByUserId(String userId);
+
+    /**
+     * 获取用户在某一个平台的会员情况
+     *
+     * @param userId 用户id
+     * @param platform 平台
+     * @return UserSubscriptionInfo
+     */
+    UserSubscriptionInfo getByUserIdAndPlatform(String userId, Integer platform);
+
+    /**
+     * 插入用户会员信息
+     *
+     * @param userSubscriptionInfo userSubscriptionInfo
+     */
+    void insert(UserSubscriptionInfo userSubscriptionInfo);
+
+    /**
+     * 更新用户会员信息
+     *
+     * @param userSubscriptionInfo userSubscriptionInfo
+     */
+    void update(UserSubscriptionInfo userSubscriptionInfo);
 }

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

@@ -120,36 +120,30 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public void updateUserForPaySuccess(UpdateUserForPaySuccessDTO updateUserForPaySuccessDTO) {
+    public void updateUserForOrder(UpdateUserForOrderDTO updateUserForOrderDTO) {
         //支付成功之后修改用户状态
-        User user = userMapper.selectByPrimaryKey(updateUserForPaySuccessDTO.getUserId());
+        User user = userMapper.selectByPrimaryKey(updateUserForOrderDTO.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
-        //用户如果在订阅中 然后给用户赠送了试用，那么状态还是订阅中（根据付费类型和当前状态来判断）
-
-        user.setValidFlag(null);
+        //通过用户id和平台类型查询会员信息表，如果有会员信息则更新，如果没有会员信息就插入
+        UserSubscriptionInfo userSubscriptionInfo = userSubscriptionInfoService.getByUserIdAndPlatform(user.getId(), updateUserForOrderDTO.getPlatform());
+        if(ObjectUtils.isEmpty(userSubscriptionInfo)){
+            UserSubscriptionInfo newInfo = new UserSubscriptionInfo().withId(CommonUtils.generateId())
+                    .withUserId(user.getId()).withStatus(updateUserForOrderDTO.getUserStatus())
+                    .withPayType(updateUserForOrderDTO.getPayTpe()).withEndDate(updateUserForOrderDTO.getEndDate());
+            userSubscriptionInfoService.insert(newInfo);
+        }else{
+          //更新
+            userSubscriptionInfo.setPayType(updateUserForOrderDTO.getPayTpe());
+            userSubscriptionInfo.setStatus(updateUserForOrderDTO.getUserStatus());
+            userSubscriptionInfo.setEndDate(updateUserForOrderDTO.getEndDate());
+            userSubscriptionInfoService.update(userSubscriptionInfo);
+        }
         userMapper.updateByPrimaryKey(user);
     }
 
-    @Override
-    public void updateUserForRefund(UpdateUserForRefundDTO updateUserForRefundDTO) {
-        //退单之后修改用户状态
-        User user = userMapper.selectByPrimaryKey(updateUserForRefundDTO.getUserId());
-        user.setUpdatedAt(new Date());
-        // 推线账号类型 付费账号1 免费账号0 AccountTypeEnum
-        // user.setAccountType(AccountTypeEnum.PAID_ACCOUNT.value());
-        //付费类型 0 试用 1单次购买 2订阅 3单次购买+订阅 4买断 PaidTypeEnum
-//        user.setPayType(null);
-        //0已注销（1订阅中2订阅过期3试用中4试用过期）PDFOfficeUserStatusEnum
-        user.setValidFlag(null);
-        userMapper.updateByPrimaryKey(user);
-    }
 
     @Override
     public void register(UserRegisterDTO userRegisterDTO) {

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

@@ -4,6 +4,7 @@ import cn.kdan.cloud.pdf.office.account.mapper.UserSubscriptionInfoMapper;
 import cn.kdan.cloud.pdf.office.account.model.UserSubscriptionInfo;
 import cn.kdan.cloud.pdf.office.account.model.UserSubscriptionInfoExample;
 import cn.kdan.cloud.pdf.office.account.service.UserSubscriptionInfoService;
+import com.alibaba.nacos.common.utils.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -25,4 +26,22 @@ public class UserSubscriptionInfoServiceImpl implements UserSubscriptionInfoServ
         example.createCriteria().andUserIdEqualTo(userId);
         return userSubscriptionInfoMapper.selectByExample(example);
     }
+
+    @Override
+    public UserSubscriptionInfo getByUserIdAndPlatform(String userId, Integer platform) {
+        UserSubscriptionInfoExample example = new UserSubscriptionInfoExample();
+        example.createCriteria().andUserIdEqualTo(userId).andPlatformEqualTo(platform);
+        List<UserSubscriptionInfo> list = userSubscriptionInfoMapper.selectByExample(example);
+        return CollectionUtils.isNotEmpty(list) ? list.get(0): null;
+    }
+
+    @Override
+    public void insert(UserSubscriptionInfo userSubscriptionInfo) {
+        userSubscriptionInfoMapper.insert(userSubscriptionInfo);
+    }
+
+    @Override
+    public void update(UserSubscriptionInfo userSubscriptionInfo) {
+        userSubscriptionInfoMapper.updateByPrimaryKeySelective(userSubscriptionInfo);
+    }
 }

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

@@ -2,11 +2,13 @@ package cn.kdan.cloud.pdf.office.api.account.dto;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author tangxiangan
  */
 @Data
-public class UpdateUserForPaySuccessDTO {
+public class UpdateUserForOrderDTO {
 
     private String userId;
     /**
@@ -14,12 +16,18 @@ public class UpdateUserForPaySuccessDTO {
      */
     private Integer payTpe;
     /**
-     * MemberTypeEnum  mac会员 1 windows会员 2 mac+window会员3
+     * 0已注销（1订阅中2订阅过期3试用中4试用过期）PDFOfficeUserStatusEnum
      */
-    private Integer memberType;
+    private Integer userStatus;
+
     /**
-     * 0已注销（1订阅中2订阅过期3试用中4试用过期）PDFOfficeUserStatusEnum
+     *  1windows 2 mac
+     */
+    private Integer platform;;
+
+    /**
+     * 失效日期
      */
-    private Integer userStatus;;
+    private Date endDate;
 
 }

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

@@ -1,21 +0,0 @@
-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

@@ -59,18 +59,10 @@ public interface UserApi {
     /**
      * 支付成功之后修改用户状态
      *
-     * @param updateUserForPaySuccessDTO dto
+     * @param updateUserForOrderDTO dto
      */
-    @PostMapping(value = "updateUserForPaySuccess")
-    ResultMap<Boolean> updateUserForPaySuccess(@RequestBody UpdateUserForPaySuccessDTO updateUserForPaySuccessDTO);
-
-    /**
-     * 退款成功之后修改用户状态
-     *
-     * @param updateUserForRefundDTO dto
-     */
-    @PostMapping(value = "updateUserForRefund")
-    ResultMap<Boolean> updateUserForRefund(@RequestBody UpdateUserForRefundDTO updateUserForRefundDTO);
+    @PostMapping(value = "updateUserForOrder")
+    ResultMap<Boolean> updateUserForOrder(@RequestBody UpdateUserForOrderDTO updateUserForOrderDTO);
 
 
     @GetMapping("/page")

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

@@ -49,12 +49,7 @@ public class UserHystrix implements UserApi {
     }
 
     @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) {
+    public ResultMap<Boolean> updateUserForOrder(UpdateUserForOrderDTO updateUserForOrderDTO) {
         return new ResultMap<>(CommonConstant.ERROR, CommonConstant.RESULT_ERROR_SERVICE_NOT_AVAILABLE);
     }
 

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

@@ -1,6 +1,6 @@
 package cn.kdan.cloud.pdf.office.payment.service.impl;
 
-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.bo.OrderSucceededBO;
 import cn.kdan.cloud.pdf.office.api.payment.constant.SubscriptionConstant;
@@ -86,11 +86,11 @@ public class PaddleWebhookServiceImpl implements PaddleWebhookService {
             }
         }
         // 修改订单状态
-        UpdateUserForPaySuccessDTO successDTO = new UpdateUserForPaySuccessDTO();
+        UpdateUserForOrderDTO successDTO = new UpdateUserForOrderDTO();
         successDTO.setUserId(orderUpdate.getUserId());
         successDTO.setPayTpe(PaidTypeEnum.SUBSCRIBE.value());
-        successDTO.setMemberType(memberTypeEnum.value());
-        userApi.updateUserForPaySuccess(successDTO);
+//        successDTO.setMemberType(memberTypeEnum.value());
+        userApi.updateUserForOrder(successDTO);
     }
 
     @Override