yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates 抖音新增体育小程序

This commit is contained in:
zhouwentao 2024-07-16 16:09:38 +08:00
parent f387d6a558
commit 92ee2f76fd
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserController.java
View File

@ -464,6 +464,7 @@ public class MiniUserController {
LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
//queryWrapper.eq(SysUser::getUsername,username);
queryWrapper.eq(SysUser::getPhone, username);
queryWrapper.eq(SysUser::getProgramType,"艺体志愿宝");
SysUser sysUser = sysUserService.getOne(queryWrapper);
//update-end-author:wangshuai date:20200601 for: 登录代码验证用户是否注销bug，if条件永远为false
result = sysUserService.checkUserIsEffective(sysUser);
@ -546,6 +547,7 @@ public class MiniUserController {
user.setUserIdentity(CommonConstant.USER_IDENTITY_1);
user.setDelFlag(CommonConstant.DEL_FLAG_0);
user.setOrgCode(null);
user.setProgramType("艺体志愿宝");
sysUserService.saveUser(user, null, null, null);
}else{
//该手机号已经注册，直接覆盖微信openId
@ -631,7 +633,10 @@ public class MiniUserController {
return Result.error("获取用户信息失败");
}
String openId = baseData.get("openid").toString();
SysUser user = sysUserService.getByDyOpenId(openId);
LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysUser::getDyOpenId,openId);
queryWrapper.eq(SysUser::getProgramType,"艺体志愿宝");
SysUser user = sysUserService.getOne(queryWrapper);
if (user == null) {
redisTokenTime = 3600;
String salt = oConvertUtils.randomGen(8);
@ -647,6 +652,7 @@ public class MiniUserController {
user.setUserIdentity(CommonConstant.USER_IDENTITY_1);
user.setDelFlag(CommonConstant.DEL_FLAG_0);
user.setOrgCode(null);
user.setProgramType("艺体志愿宝");
sysUserService.saveUser(user, null, null, null);
}
@ -680,7 +686,10 @@ public class MiniUserController {
@GetMapping(value = "/dy/checkBindPhone")
@ApiOperation(value = "抖音-判断手机号的绑定情况")
public Result<?> dyCheckBindPhone(@RequestParam String phone) {
SysUser sysUser = sysUserService.getUserByPhone(phone);
LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysUser::getPhone,phone);
queryWrapper.eq(SysUser::getProgramType,"艺体志愿宝");
SysUser sysUser = sysUserService.getOne(queryWrapper);
Map<String, Object> data = new HashMap<>();
if (sysUser == null) {
//未绑定
@ -701,7 +710,10 @@ public class MiniUserController {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String id = loginUser.getId();
String phone = sysUser.getPhone();
SysUser newSysUser = sysUserService.getUserByPhone(phone);
LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysUser::getPhone,phone);
queryWrapper.eq(SysUser::getProgramType,"艺体志愿宝");
SysUser newSysUser = sysUserService.getOne(queryWrapper);
if (newSysUser == null) {
//绑定手机号
LambdaUpdateWrapper<SysUser> sysUserLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
@ -710,6 +722,7 @@ public class MiniUserController {
sysUserService.update(sysUserLambdaUpdateWrapper);
return Result.OK(1);
}
AssertUtils.isEmpty(newSysUser.getPhone(),"该手机号已被绑定");
//对应手机号的数据转移到当前账号下
miniUserService.transferDataUser(id, newSysUser.getId());
return Result.OK(2);

5
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/WxPayApiController.java
View File

@ -115,6 +115,10 @@ public class WxPayApiController {
@RequestMapping("/jsApiPay")
@ResponseBody
public Result<?> jsApiPay(@RequestBody JSONObject requestBody) {
String programType = requestBody.getStr("programType");
if (StringUtils.isBlank(programType)) {
programType = "艺体志愿宝";
}
String skuCode = requestBody.getStr("skuCode");
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
SysUser user = sysUserService.getById(sysUser.getId());
@ -191,6 +195,7 @@ public class WxPayApiController {
yxOrder.setOrderSign(jsonStr);
yxOrder.setOrderStatus("1");
yxOrder.setPaymentType("3");//微信支付
yxOrder.setProgramType(programType);
yxOrderService.save(yxOrder);
//==============创建订单信息 End
return Result.OK("获取成功",yxOrder.getOrderCode());