ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
@@ -14,6 +14,9 @@ @ApiModelProperty(value = "订单id") private Long id; @ApiModelProperty(value = "订单状态") private Integer orderStatus; @ApiModelProperty(value = "订单商品") private List<OrderGoodsVO> goodsList;
@@ -99,6 +99,19 @@ userAddressService.updateById(byId); return R.ok(); } /** * 获取登录用户地址列表 * @return */ @ResponseBody @GetMapping("/getUserAddressList") @ApiOperation(value = "获取登录用户地址列表", tags = {"小程序-个人中心首页-我的地址"}) public R<List<UserAddress>> getUserAddressList(){ Long userId = tokenService.getLoginUserApplet().getUserid(); List<UserAddress> list = userAddressService.lambdaQuery().eq(UserAddress::getAppUserId, userId).list(); return R.ok(list); } /** * 根据id获取用户地址信息 @@ -111,6 +124,8 @@ UserAddress userAddress = userAddressService.getById(id); return R.ok(userAddress); } }
@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; @@ -115,18 +116,19 @@ return R.ok(list); } // /** // * 充值 // */ // @GetMapping("recharge") // @ApiOperation(value = "充值", notes = "钱包充值") // public AjaxResult recharge(@ApiParam(value = "充值金额", required = true) @RequestParam BigDecimal amount) { // Long userId = SecurityUtils.getUserId(); // String openId; // // 商户号 // String partnerTradeNo; // // TODO 充值 // return AjaxResult.success(); // } /** * 充值 */ @GetMapping("recharge") @ApiOperation(value = "充值", notes = "钱包充值") public R<Void> recharge(@ApiParam(value = "充值金额", required = true) @RequestParam BigDecimal amount) { LoginUser loginUserApplet = tokenService.getLoginUserApplet(); AppUser appUser = appUserService.getById(loginUserApplet.getUserid()); String wxOpenid = appUser.getWxOpenid(); // 商户号 String partnerTradeNo; // TODO 充值 return R.ok(); } } 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-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -115,6 +115,7 @@ OrderDetailVO orderDetailVO = new OrderDetailVO(); orderDetailVO.setId(order.getId()); orderDetailVO.setOrderStatus(order.getOrderStatus()); orderDetailVO.setPoint(order.getPoint()); orderDetailVO.setAddressId(userAddress.getId()); orderDetailVO.setRecieveName(userAddress.getRecieveName());
