feat:发票添加申请人

feat:添加微信小程序的用户入口

pjcloud-app-server/pjcloud-app-server-biz/pom.xml

@@ -115,6 +115,12 @@
             <artifactId>alipay-sdk-java</artifactId>
             <version>4.40.251.ALL</version>
         </dependency>
+        <!-- 微信登录(小程序) -->
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>
+            <version>4.7.0</version>
+        </dependency>
     </dependencies>
 
     <profiles>

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/config/MinWechatConfiguration.java

@@ -0,0 +1,38 @@
+package com.bsd.pjcloud.app.config;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Slf4j
+@Configuration
+@EnableConfigurationProperties(MiniWechatConf.class)
+public class MinWechatConfiguration {
+
+    private final MiniWechatConf properties;
+
+    @Autowired
+    public MinWechatConfiguration(MiniWechatConf properties) {
+        this.properties = properties;
+    }
+
+
+    @Bean
+    public WxMaService wxMaService() {
+
+        WxMaDefaultConfigImpl wxMaDefaultConfig = new WxMaDefaultConfigImpl();
+        wxMaDefaultConfig.setAppid(properties.getAppId());
+        wxMaDefaultConfig.setSecret(properties.getAppSecret());
+        wxMaDefaultConfig.setMsgDataFormat("JSON");
+
+        WxMaService maService = new WxMaServiceImpl();
+        maService.setWxMaConfig(wxMaDefaultConfig);
+        return maService;
+    }
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/config/MiniWechatConf.java

@@ -0,0 +1,18 @@
+package com.bsd.pjcloud.app.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * 微信小程序配置
+ */
+@Data
+@ConfigurationProperties(prefix = "mini-wechat-pay")
+public class MiniWechatConf {
+    /**
+     * 应用ID
+     */
+    private String appId;
+
+    private String appSecret;
+}

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

@@ -24,6 +24,7 @@ import com.bsd.pjcloud.admin.api.dto.UserTokenDTO;
 import com.bsd.pjcloud.admin.api.entity.SysUser;
 import com.bsd.pjcloud.admin.api.feign.RemoteTokenService;
 import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
+import com.bsd.pjcloud.app.api.dto.AppUserDTO;
 import com.bsd.pjcloud.app.service.AppUserService;
 import com.bsd.pjcloud.canteen.api.feign.RemoteCanteenSpuService;
 import com.bsd.pjcloud.canteen.api.feign.RemoteDailyMenuService;
@@ -33,6 +34,7 @@ import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
 import com.bsd.pjcloud.canteen.vo.app.CanteenOnlineSpuAppVO;
 import com.bsd.pjcloud.canteen.vo.app.DailyMenuAppVO;
 import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.security.annotation.Inner;
 import com.bsd.pjcloud.thirdparty.api.feign.RemoterThirdPartyAuthService;
 import com.bsd.pjcloud.thirdparty.dto.SHJNSSODTO;
@@ -387,12 +389,13 @@ public class AppUserAutoLoginController {
 //		return appUserService.importUser(excelVOList, bindingResult);
 //	}
 //
-//	@Operation(summary = "注册app用户表", description = "注册app用户表")
-//	@SysLog("注册app用户表")
-//	@Inner(value = false)
-//	@PostMapping("/register")
-//	public R register(@RequestBody AppUserDTO appUser) {
-//		return appUserService.registerAppUser(appUser);
-//	}
+
+//@Operation(summary = "注册app用户表", description = "注册app用户表")
+//@SysLog("注册app用户表")
+//@Inner(value = false)
+//@PostMapping("/register")
+//public R register(@RequestBody AppUserDTO appUser) {
+//    return appUserService.registerAppUser(appUser);
+//}
 
 }

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

@@ -17,18 +17,15 @@
 
 package com.bsd.pjcloud.app.handler;
 
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.hutool.core.util.ObjectUtil;
 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.AppSocialDetails;
 import com.bsd.pjcloud.app.api.entity.AppUser;
 import com.bsd.pjcloud.app.mapper.AppSocialDetailsMapper;
 import com.bsd.pjcloud.app.service.AppUserService;
-import com.bsd.pjcloud.common.core.constant.SecurityConstants;
-import com.bsd.pjcloud.common.core.constant.enums.LoginTypeEnum;
-import com.bsd.pjcloud.common.core.exception.CheckedException;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -47,6 +44,8 @@ public class MiniWechatLoginHandler extends AbstractLoginHandler {
 
     private final AppSocialDetailsMapper appSocialDetailsMapper;
 
+    private final WxMaService wxMaService;
+
     /**
      * 小程序登录传入code
      * <p>
@@ -57,20 +56,16 @@ public class MiniWechatLoginHandler extends AbstractLoginHandler {
      */
     @Override
     public String identify(String code) {
-        AppSocialDetails condition = new AppSocialDetails();
-        condition.setType(LoginTypeEnum.MINI_APP.getType());
-        AppSocialDetails socialDetails = appSocialDetailsMapper.selectOne(new QueryWrapper<>(condition));
-
-        String url = String.format(SecurityConstants.MINI_APP_AUTHORIZATION_CODE_URL, socialDetails.getAppId(),
-                socialDetails.getAppSecret(), code);
-        String result = HttpUtil.get(url);
-        log.debug("微信小程序响应报文:{}", result);
-
-        if (JSONUtil.parseObj(result).containsKey("openid")) {
-            return JSONUtil.parseObj(result).get("openid").toString();
-        } else {
-            log.error("微信小程序登录失败:{}", result);
-            throw new CheckedException("微信小程序登录失败");
+        try {
+            WxMaJscode2SessionResult session = wxMaService.getUserService().getSessionInfo(code);
+            if (ObjectUtil.isNotEmpty(session) && ObjectUtil.isNotEmpty(session.getOpenid())) {
+                return session.getOpenid();
+            }
+            return null;
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("微信小程序登录失败:{}", e.getMessage());
+            return null;
         }
     }
 
@@ -83,22 +78,22 @@ public class MiniWechatLoginHandler extends AbstractLoginHandler {
     @Override
     public AppUserInfo info(String openId) {
         AppUser user = appUserService.getOne(Wrappers.<AppUser>query().lambda().eq(AppUser::getOpenid, openId));
-
-        // 未注册用户自动注册
-        if (Objects.isNull(user)) {
-            log.info("微信小程序未绑定:{},创建新的用户", openId);
+        if (ObjectUtil.isEmpty(user)) {
+            log.info("微信小程序openId:{},创建新的用户", openId);
+            String name = "微信游客-" + openId;
             AppUser appUser = new AppUser();
             appUser.setOpenid(openId);
-            appUser.setUsername(openId);
+            appUser.setUserType(AppUserTypeEnum.MINI_ALIPAY.getType());
+            appUser.setUsername(name);
+            appUser.setName(name);
             appUser.setCreateBy(openId);
             appUser.setUpdateBy(openId);
             appUserService.saveOrUpdate(appUser);
-
-            AppUserInfo appUserDTO = new AppUserInfo();
-            appUserDTO.setAppUser(appUser);
-            return appUserDTO;
+            return appUserService.findUserInfo(user);
         }
+        if (ObjectUtil.isEmpty(user.getLoginExtJson())) {
 
+        }
         return appUserService.findUserInfo(user);
     }
 

pjcloud-app-server/pjcloud-app-server-biz/src/main/resources/application.yml

@@ -24,3 +24,7 @@ mini-ali-pay:
   alipay-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqnCB+N172m5gxf1Rolfx5LErSiVwQCh0XQdDrVy6aTuVF5EtdqahSHtADyEPsBWudMBhzCfqpoZvfnvH7a+PED6uZ3DoXt7ETh8TmNM5yc+WTnD8pSphQvuHDJ3zMks489KNxiX6sXag71k9H1MXklJGPOUaljHqy/QlRn2ZLT7pFgaFH9LEcVoQBPIOurUn95078h848RFD30jZFW3fakxUGAGVVZaHH62z5OEWOmcA+CwxsEDMa1XMt02RGXgAAq4WOj+BqOGiFmhM8rnrUMchTyvx4umOzGvbF2Y9irN3aBZ5lfg+bzYcJpIOMzlM/V00LnEWzCblJzXNyH4hJQIDAQAB
   callback-url: https://rj4jv5rwqs.by.takin.cc/hard/hard-ali-pay/callback
   # callback-url: https://stgl.pj.gov.cn/api/hard/hard-ali-pay/callback
+
+mini-wechat-pay:
+  app-id: wx95481f43b14565e5
+  app-secret: 0aee1289b5ae14c0c69b8f5e9a4e518e