zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new

pull/2/head
perry 2023-05-22 22:04:07 +08:00
parent 0b928b1abc d84b6869f5
commit a6f614c580
9 changed files with 54 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java
View File

@ -12,11 +12,13 @@ import cn.iocoder.yudao.module.shop.service.recharge.PhoneRecordService;
import cn.iocoder.yudao.module.shop.service.recharge.RechargeGearService;
import cn.iocoder.yudao.module.shop.service.recharge.RechargeOrderService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@ -64,6 +66,12 @@ public class MemberController {
return CommonResult.success(rechargeOrderService.memberHeadInfo());
}
@Operation(summary = "根据手机号查询档次信息")
@RequestMapping(value = "/memberByHomeGradeInfo", method = RequestMethod.GET)
@PreAuthenticated
@TenantIgnore
public CommonResult<List<RechargeGearRespVO>> memberByPhoneGradeInfo(@RequestParam String phone) {
return CommonResult.success(rechargeGearService.memberByPhoneGradeInfo(phone));
}
}

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearService.java
View File

@ -68,4 +68,6 @@ public interface RechargeGearService {
List<RechargeGearDO> getRechargeGearList(RechargeGearExportReqVO exportReqVO);
List<RechargeGearRespVO> getGradeInfo();
List<RechargeGearRespVO> memberByPhoneGradeInfo(String phone);
}

23
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearServiceImpl.java
View File

@ -125,4 +125,27 @@ public class RechargeGearServiceImpl implements RechargeGearService {
return rechargeGearRespVOS;
}
@Override
public List<RechargeGearRespVO> memberByPhoneGradeInfo(String phone) {
List<RechargeGearDO> rechargeGearDOS = rechargeGearMapper.selectList(Wrappers.<RechargeGearDO>lambdaQuery()
.eq(RechargeGearDO::getDeleted, 0));
List<RechargeGearRespVO> rechargeGearRespVOS = RechargeGearConvert.INSTANCE.convertList(rechargeGearDOS);
RechargeOrderDO orderDO = orderMapper.selectOne(Wrappers.<RechargeOrderDO>lambdaQuery().eq(RechargeOrderDO::getUserPhone, phone)
.eq(RechargeOrderDO::getPaid,1)
.last("LIMIT 1"));
if (Objects.nonNull(orderDO)) {
List<PhoneRecordDO> infoDOS = phoneRecordMapper.selectList(Wrappers.<PhoneRecordDO>lambdaQuery().eq(PhoneRecordDO::getRechargeOrderId, orderDO.getId()));
Map<Long, List<PhoneRecordDO>> collect = infoDOS.stream().collect(Collectors.groupingBy(PhoneRecordDO::getRechargeGearId));
rechargeGearRespVOS.forEach(vo -> {
List<PhoneRecordDO> infoDOS1 = collect.get(vo.getId());
if (!CollectionUtils.isEmpty(infoDOS1)) {
vo.setIsExist("1");
} else {
vo.setIsExist("0");
}
});
}
return rechargeGearRespVOS;
}
}

4
yudao-ui-app/config/app.js
View File

@ -1,12 +1,12 @@
let domain = 'http://192.168.1.147:48080'
let domain = 'http://yuxy.perrymake.com'
module.exports = {
// 请求域名 格式： https://您的域名
// #ifdef MP
HTTP_REQUEST_URL: domain,
// #endif
HTTP_ADMIN_URL:'http://192.168.1.147:48080', //PC后台的API请求地址，上传图片用
HTTP_ADMIN_URL:'http://yuxy.perrymake.com', //PC后台的API请求地址，上传图片用
// #ifdef H5
//H5接口是浏览器地址
// HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host,

2
yudao-ui-app/manifest.json
View File

@ -1,6 +1,6 @@
{
"name" : "创盈云",
"appid" : "__UNI__C8AF139",
"appid" : "__UNI__B5A2217",
"description" : "创盈商城",
"versionName" : "1.0.0",
"versionCode" : 1001,

2
yudao-ui-app/pages/users/login/index.vue
View File

@ -478,7 +478,7 @@
justify-content: center;
width: 100%;
height: 87rpx;
margin-top: 137rpx;
margin-top: 237rpx;
color: #FFFFFF;
font-size: 32rpx;
background: linear-gradient(0deg, #E63163 0%, #FF819F 100%);

8
yudao-ui-app/pages/users/register/index.vue
View File

@ -1,7 +1,8 @@
<template>
<div class="login-wrapper">
<div class="logo-wrap">
<img src="/static/images/logo.png" style="width:127rpx;height:45rpx;"></image>
<img src="/static/images/mallLogo.png" style="width:105rpx;height:105rpx;"></image>
<img src="/static/images/mall.png" style="width:233rpx;height:43rpx;"></image>
</div>
<view class="title">注册账号</view>
<div class="whiteBg">
@ -206,6 +207,11 @@
.logo-wrap {
margin: 285rpx 0 85rpx 0;
display:flex;
align-items:center;
img{
margin-right: 20rpx;
}
}
.title {

10
yudao-ui-app/pages/users/retrievePassword/index.vue
View File

@ -1,7 +1,8 @@
<template>
<div class="login-wrapper">
<div class="logo-wrap">
<img src="/static/images/logo.png" style="width:127rpx;height:45rpx;"></image>
<img src="/static/images/mallLogo.png" style="width:105rpx;height:105rpx;"></image>
<img src="/static/images/mall.png" style="width:233rpx;height:43rpx;"></image>
</div>
<view class="title">找回密码</view>
<div class="whiteBg">
@ -154,6 +155,11 @@
.logo-wrap {
margin: 285rpx 0 85rpx 0;
display:flex;
align-items:center;
img{
margin-right: 20rpx;
}
}
.title {
@ -227,7 +233,7 @@
justify-content: center;
width: 100%;
height: 87rpx;
margin-top: 80rpx;
margin-top: 99rpx;
color: #FFFFFF;
font-size: 32rpx;
background: linear-gradient(0deg, #E63163 0%, #FF819F 100%);

2
yudao-ui-app/pages/users/user_spread_code/index.vue
View File

@ -239,7 +239,7 @@
success: function(res) {
context.drawImage(arrImages, 0, 0, 750, 1190);
context.save();
context.drawImage(code, 110, 925, 140, 140);
context.drawImage(code, 110, 700, 300, 300);
context.restore();
context.setFontSize(28);
context.fillText(nickname, 270, 980);