ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Share.java
@@ -76,7 +76,7 @@ @ApiModelProperty(value = "对象id") @TableField("object_id") private Integer objectId; private String objectId; } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -192,18 +192,17 @@ // return R.fail("验证码错误"); // } //使用jscode获取微信openid // Map<String, Object> map = weChatUtil.code2Session(registerAccount.getJscode()); // Integer errcode = Integer.valueOf(map.get("errcode").toString()); // if(0 != errcode){ // return R.fail(map.get("msg").toString()); // } // String openid = map.get("openid").toString(); // //查询用户是否注册 // AppUser appUser = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getWxOpenid, openid).ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0)); // if(null != appUser){ // return R.fail("此微信号已注册，请直接登录！"); // } AppUser appUser = null; Map<String, Object> map = weChatUtil.code2Session(registerAccount.getJscode()); Integer errcode = Integer.valueOf(map.get("errcode").toString()); if(0 != errcode){ return R.fail(map.get("msg").toString()); } String openid = map.get("openid").toString(); //查询用户是否注册 AppUser appUser = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getWxOpenid, openid).ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0)); if(null != appUser){ return R.fail("此微信号已注册，请直接登录！"); } AppUser appUser1 = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhone, registerAccount.getPhone()).ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0)); if(null != appUser1){ return R.fail("手机号已注册，请直接登录！"); @@ -212,7 +211,7 @@ appUser = new AppUser(); appUser.setName(registerAccount.getName()); appUser.setPhone(registerAccount.getPhone()); // appUser.setWxOpenid(openid); appUser.setWxOpenid(openid); //注册默认为普通会员 appUser.setVipId(1); appUser.setStatus(1); ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/TaskUtil.java
File was renamed from ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/TaskUtil.java @@ -1,4 +1,4 @@ package com.ruoyi.account.util.weChat; package com.ruoyi.account.util; import org.springframework.scheduling.annotation.Scheduled; ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/AES.java
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/WXCore.java
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/WeChatUtil.java
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/WxPKCS7Encoder.java
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.other.api.domain.Share; import com.ruoyi.other.enums.ShareAddType; import com.ruoyi.other.enums.ShareAuditStatus; @@ -31,6 +32,8 @@ public class ShareController extends BaseController { @Resource private ShareService shareService; @Resource private TokenService tokenService; /** * 分享列表 @@ -46,14 +49,29 @@ } @ApiOperation(value = "分享页列表", tags = {"小程序-推广中心"}) @GetMapping("/recommand/list") public R<List<Share>> recommandlist(){ Long userid = tokenService.getLoginUserApplet().getUserid(); return R.ok(shareService.list(new LambdaQueryWrapper<Share>().eq(Share::getAddType,2) .eq(Share::getObjectId, userid))); } /** * 分享添加 */ @ApiOperation(value = "分享添加", tags = {"小程序-个人中心-门店管理-分享添加"}) @PostMapping public R<Void> add(@RequestBody Share share){ share.setAddType(ShareAddType.STORE.getCode()); share.setAuditStatus(ShareAuditStatus.WAIT.getCode()); Long userid = tokenService.getLoginUserApplet().getUserid(); if (share.getAddType()==1) { share.setAuditStatus(ShareAuditStatus.WAIT.getCode()); }else if (share.getAddType()==2){ share.setAuditStatus(ShareAuditStatus.WAIT.getCode()); share.setObjectId(userid.toString()); } share.setDelFlag(0); share.setAppletShare(1); shareService.save(share);
