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

Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

pull/2/head
TianYu 2023-05-23 09:47:36 +08:00
parent bb12efb278 b45a6d49b6
commit 1f3d68faf0
11 changed files with 67 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -16,13 +16,13 @@
<module>yudao-module-member</module>
<module>yudao-module-system</module>
<module>yudao-module-infra</module>
<module>yudao-module-pay</module>
<!-- <module>yudao-module-pay</module>-->
<!-- <module>yudao-module-bpm</module>-->
<!-- <module>yudao-module-report</module>-->
<!-- <module>yudao-module-mp</module>-->
<module>yudao-module-mall</module>
<!-- 示例项目 -->
<module>yudao-example</module>
<!-- <module>yudao-example</module>-->
</modules>
<name>${project.artifactId}</name>

12
yudao-module-mall/pom.xml
View File

@ -18,12 +18,12 @@
商城大模块，由 product 商品、promotion 营销、trade 交易等组成
</description>
<modules>
<module>yudao-module-promotion-api</module>
<module>yudao-module-promotion-biz</module>
<module>yudao-module-product-api</module>
<module>yudao-module-product-biz</module>
<module>yudao-module-trade-api</module>
<module>yudao-module-trade-biz</module>
<!-- <module>yudao-module-promotion-api</module>-->
<!-- <module>yudao-module-promotion-biz</module>-->
<!-- <module>yudao-module-product-api</module>-->
<!-- <module>yudao-module-product-biz</module>-->
<!-- <module>yudao-module-trade-api</module>-->
<!-- <module>yudao-module-trade-biz</module>-->
<module>yudao-module-shop-biz</module>
<module>yudao-module-shop-api</module>
</modules>

5
yudao-module-mall/yudao-module-shop-biz/pom.xml
View File

@ -17,11 +17,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>cn.iocoder.boot</groupId>
<artifactId>yudao-module-product-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cn.iocoder.boot</groupId>

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;
}
}

12
yudao-server/src/main/resources/application-dev.yaml
View File

@ -45,7 +45,7 @@ spring:
datasource:
master:
name: cyywl
url: jdbc:mysql://117.33.142.185:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true
url: jdbc:mysql://47.109.92.244:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true
driver-class-name: com.mysql.jdbc.Driver
username: root
password: axzsd110
@ -58,10 +58,10 @@ spring:
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
host: 117.33.142.185 # 地址
host: 47.109.92.244 # 地址
port: 6369 # 端口
database: 6 # 数据库索引
password: 20221122@dev # 密码，建议生产环境开启
password: cyywl123.. # 密码，建议生产环境开启
--- #################### 定时任务相关配置 ####################
@ -216,7 +216,7 @@ wx:
useRedis: false
defaultContent: \u60A8\u597D\uFF0C\u6709\u4EC0\u4E48\u95EE\u9898\uFF1F
redisConfig:
host: 117.33.142.185 # 地址
port: 6369 # 端口
host: 47.109.92.244 # 地址
port: 6399 # 端口
database: 16 # 数据库索引
password: 20221122@dev # 密码，建议生产环境开启
password: cyywl123.. # 密码，建议生产环境开启

17
yudao-server/src/main/resources/application-prod.yaml
View File

@ -47,10 +47,10 @@ spring:
datasource:
master:
name: cyywl
url: jdbc:mysql://117.33.142.185:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true
url: jdbc:mysql://47.109.92.244:3386/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true
driver-class-name: com.mysql.jdbc.Driver
username: root
password: axzsd110
password: cyywl123
# slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
# name: ruoyi-vue-pro
# url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
@ -60,10 +60,10 @@ spring:
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
host: 117.33.142.185 # 地址
port: 6369 # 端口
host: 47.109.92.244 # 地址
port: 6399 # 端口
database: 6 # 数据库索引
password: 20221122@dev # 密码，建议生产环境开启
password: cyywl123.. # 密码，建议生产环境开启
--- #################### 定时任务相关配置 ####################
@ -143,6 +143,13 @@ logging:
--- #################### 微信公众号相关配置 ####################
wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
mp:
useRedis: false
defaultContent: \u60A8\u597D\uFF0C\u6709\u4EC0\u4E48\u95EE\u9898\uFF1F
redisConfig:
host: 47.109.92.244 # 地址
port: 6399 # 端口
database: 16 # 数据库索引
password: cyywl123.. # 密码，建议生产环境开启
# 公众号配置(必填)
app-id: wx041349c6f39b268b
secret: 5abee519483bc9f8cb37ce280e814bd0

3
yudao-server/src/main/resources/application.yaml
View File

@ -196,6 +196,7 @@ yudao:
- rep_demo_jianpiao
- tmp_report_data_1
- tmp_report_data_income
- eb_category
- eb_shipping_templates
- eb_shipping_templates_free
- eb_shipping_templates_no_delivery
@ -221,7 +222,7 @@ yudao:
- eb_store_order_status
sms-code: # 短信验证码相关的配置项
expire-times: 5m
send-frequency: 10m
send-frequency: 10s
send-maximum-quantity-per-day: 10
begin-code: 100000 # 这里配置 9999 的原因是，测试方便。
end-code: 999999 # 这里配置 9999 的原因是，测试方便。

4
yudao-ui-admin/.env.dev
View File

@ -5,8 +5,8 @@ ENV = 'development'
VUE_APP_TITLE = 创盈商户管理系统
# 芋道管理系统/开发环境
#VUE_APP_BASE_API = 'https://cmx.bskies.cc:8000/cyywl-api'
VUE_APP_BASE_API = 'http://192.168.1.147:48080'
VUE_APP_BASE_API = 'https://cmx.bskies.cc:8000/cyywl-api'
#VUE_APP_BASE_API = 'http://192.168.1.147:48080'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

6
yudao-ui-admin/.env.prod
View File

@ -5,13 +5,13 @@ ENV = 'production'
VUE_APP_TITLE = 创盈商户管理系统
# 创盈管理系统/生产环境
VUE_APP_BASE_API = 'https://cmx.bskies.cc:8000/cyywl-api'
VUE_APP_BASE_API = 'http://api.cyywl.top'
#VUE_APP_BASE_API = 'http://192.168.2.71'
# 根据服务器或域名修改
PUBLIC_PATH = 'https://cmx.bskies.cc:8000/cy-admin/'
PUBLIC_PATH = 'http://admin.cyywl.top'
# 二级部署路径
VUE_APP_APP_NAME ='/cy-admin/'
VUE_APP_APP_NAME =''
# 多租户的开关
VUE_APP_TENANT_ENABLE = true