diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java index d8ba080d3..ae181e67f 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java @@ -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> memberByPhoneGradeInfo(@RequestParam String phone) { + return CommonResult.success(rechargeGearService.memberByPhoneGradeInfo(phone)); + } } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearService.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearService.java index 507476d2e..7a05e26cf 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearService.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearService.java @@ -68,4 +68,6 @@ public interface RechargeGearService { List getRechargeGearList(RechargeGearExportReqVO exportReqVO); List getGradeInfo(); + + List memberByPhoneGradeInfo(String phone); } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearServiceImpl.java index db01cb0b0..a184481e6 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearServiceImpl.java @@ -125,4 +125,27 @@ public class RechargeGearServiceImpl implements RechargeGearService { return rechargeGearRespVOS; } + @Override + public List memberByPhoneGradeInfo(String phone) { + List rechargeGearDOS = rechargeGearMapper.selectList(Wrappers.lambdaQuery() + .eq(RechargeGearDO::getDeleted, 0)); + List rechargeGearRespVOS = RechargeGearConvert.INSTANCE.convertList(rechargeGearDOS); + RechargeOrderDO orderDO = orderMapper.selectOne(Wrappers.lambdaQuery().eq(RechargeOrderDO::getUserPhone, phone) + .eq(RechargeOrderDO::getPaid,1) + .last("LIMIT 1")); + if (Objects.nonNull(orderDO)) { + List infoDOS = phoneRecordMapper.selectList(Wrappers.lambdaQuery().eq(PhoneRecordDO::getRechargeOrderId, orderDO.getId())); + Map> collect = infoDOS.stream().collect(Collectors.groupingBy(PhoneRecordDO::getRechargeGearId)); + rechargeGearRespVOS.forEach(vo -> { + List infoDOS1 = collect.get(vo.getId()); + if (!CollectionUtils.isEmpty(infoDOS1)) { + vo.setIsExist("1"); + } else { + vo.setIsExist("0"); + } + }); + } + return rechargeGearRespVOS; + } + } diff --git a/yudao-ui-app/config/app.js b/yudao-ui-app/config/app.js index cd2ed590d..d42b88408 100644 --- a/yudao-ui-app/config/app.js +++ b/yudao-ui-app/config/app.js @@ -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, diff --git a/yudao-ui-app/manifest.json b/yudao-ui-app/manifest.json index 6dd38c5d8..988523f01 100644 --- a/yudao-ui-app/manifest.json +++ b/yudao-ui-app/manifest.json @@ -1,6 +1,6 @@ { "name" : "创盈云", - "appid" : "__UNI__C8AF139", + "appid" : "__UNI__B5A2217", "description" : "创盈商城", "versionName" : "1.0.0", "versionCode" : 1001, diff --git a/yudao-ui-app/pages/users/login/index.vue b/yudao-ui-app/pages/users/login/index.vue index cf589e614..36d01c63b 100644 --- a/yudao-ui-app/pages/users/login/index.vue +++ b/yudao-ui-app/pages/users/login/index.vue @@ -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%); diff --git a/yudao-ui-app/pages/users/register/index.vue b/yudao-ui-app/pages/users/register/index.vue index 264f330af..30b4ba1ce 100644 --- a/yudao-ui-app/pages/users/register/index.vue +++ b/yudao-ui-app/pages/users/register/index.vue @@ -1,7 +1,8 @@