feat:免密支付

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserController.java

@@ -81,6 +81,8 @@ public class AppUserController {
 
     /* ************************************* end app end ************************************* */
 
+    /* ************************************* start 远程调用 start ************************************* */
+
     @Inner
     @GetMapping("/info/{username}")
     public R info(@PathVariable String username) {
@@ -95,6 +97,19 @@ public class AppUserController {
         return R.ok(appUserService.findUserInfo(user));
     }
 
+    @Inner
+    @GetMapping("/infoByUserId/{userId}")
+    public R<AppUserInfo> infoByUserId(@PathVariable Long userId) {
+        AppUser user = appUserService.getOne(Wrappers.<AppUser>query()
+                .lambda()
+                .eq(AppUser::getUserId, userId)
+        );
+        if (user == null) return R.failed();
+        return R.ok(appUserService.findUserInfo(user));
+    }
+
+    /* ************************************* end 远程调用 end ************************************* */
+
     /**
      * 分页查询
      */

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/handler/MiniAlipayLoginHandler.java

@@ -1,12 +1,14 @@
 package com.bsd.pjcloud.app.handler;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
 import com.alipay.api.AlipayClient;
 import com.alipay.api.AlipayConfig;
 import com.alipay.api.DefaultAlipayClient;
 import com.alipay.api.request.AlipaySystemOauthTokenRequest;
 import com.alipay.api.response.AlipaySystemOauthTokenResponse;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.bsd.pjcloud.app.api.constant.AppUserTypeEnum;
 import com.bsd.pjcloud.app.api.dto.AppUserInfo;
 import com.bsd.pjcloud.app.api.entity.AppUser;
 import com.bsd.pjcloud.app.config.MiniAlipayConf;
@@ -106,18 +108,22 @@ public class MiniAlipayLoginHandler extends AbstractLoginHandler {
      */
     @Override
     public AppUserInfo info(String openId) {
-        AppUser user = appUserService.getOne(Wrappers.<AppUser>query().lambda().eq(AppUser::getWxOpenid, openId));
+        AppUser user = appUserService.getOne(Wrappers.<AppUser>query().lambda().eq(AppUser::getOpenid, openId));
         if (ObjectUtil.isEmpty(user)) {
             log.info("支付宝小程序openId:{},创建新的用户", openId);
             String name = "支付宝游客-" + openId;
             AppUser appUser = new AppUser();
-            appUser.setWxOpenid(openId);
+            appUser.setOpenid(openId);
+            appUser.setUserType(AppUserTypeEnum.MINI_ALIPAY.getType());
             appUser.setUsername(name);
             appUser.setName(name);
             appUser.setCreateBy(openId);
             appUser.setUpdateBy(openId);
             appUserService.saveOrUpdate(appUser);
             return appUserService.findUserInfo(user);
+        }
+        if (ObjectUtil.isEmpty(user.getLoginExtJson())) {
+
         }
         return appUserService.findUserInfo(user);
     }
@@ -127,7 +133,7 @@ public class MiniAlipayLoginHandler extends AbstractLoginHandler {
      */
     @Override
     public Boolean bind(AppUser user, String identify) {
-        user.setWxOpenid(identify);
+        user.setOpenid(identify);
         appUserService.updateById(user);
         return true;
     }

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/handler/MiniWechatLoginHandler.java

@@ -82,13 +82,13 @@ public class MiniWechatLoginHandler extends AbstractLoginHandler {
      */
     @Override
     public AppUserInfo info(String openId) {
-        AppUser user = appUserService.getOne(Wrappers.<AppUser>query().lambda().eq(AppUser::getWxOpenid, openId));
+        AppUser user = appUserService.getOne(Wrappers.<AppUser>query().lambda().eq(AppUser::getOpenid, openId));
 
         // 未注册用户自动注册
         if (Objects.isNull(user)) {
             log.info("微信小程序未绑定:{},创建新的用户", openId);
             AppUser appUser = new AppUser();
-            appUser.setWxOpenid(openId);
+            appUser.setOpenid(openId);
             appUser.setUsername(openId);
             appUser.setCreateBy(openId);
             appUser.setUpdateBy(openId);
@@ -111,7 +111,7 @@ public class MiniWechatLoginHandler extends AbstractLoginHandler {
      */
     @Override
     public Boolean bind(AppUser user, String identify) {
-        user.setWxOpenid(identify);
+        user.setOpenid(identify);
         appUserService.updateById(user);
         return true;
     }