Merge branch '20251119-wyp-weCom' into test

api-module/src/main/java/com/tzld/piaoquan/api/model/vo/contentplatform/AccountQrCodeVO.java

@@ -9,6 +9,8 @@ public class AccountQrCodeVO {
     private String uuid;
     @ApiModelProperty(value = "登录二维码")
     private String qrcode;
+    @ApiModelProperty(value = "登录二维码Base64编码")
+    private String qrcodeBase64;
     @ApiModelProperty(value = "登录二维码key")
     private String Key;
     @ApiModelProperty(value = "过期时间")

api-module/src/main/java/com/tzld/piaoquan/api/service/wecom/thirdparty/impl/WeComThirdPartyAccountServiceImpl.java

@@ -90,9 +90,14 @@ public class WeComThirdPartyAccountServiceImpl implements WeComThirdPartyAccount
             log.error("WeComThirdPartyService get qr code failed, request: {}, response: {}", initRequest, qrCodeResponse);
             return null;
         }
+        // 置为待扫码状态
+        String loginStatusKey = Constant.loginStatusKey.replace("{uuid}", uuid);
+        redisUtils.set(loginStatusKey, String.valueOf(1), qrCodeResponse.getData().getTtl());
+
         AccountQrCodeVO result = new AccountQrCodeVO();
         result.setUuid(uuid);
         result.setQrcode(qrCodeResponse.getData().getQrcode());
+        result.setQrcodeBase64(qrCodeResponse.getData().getQrcode_data());
         result.setKey(qrCodeResponse.getData().getKey());
         result.setTtl(qrCodeResponse.getData().getTtl());
         return result;