abu/wzj-boot
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix]修改评论

Browse Source
This commit is contained in:
wangqx 2025-09-18 09:22:22 +08:00
parent 1bb2c72e8b
commit 418e1b52af
5 changed files with 139 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-modules/pom.xml
View File

@ -16,17 +16,13 @@
<module>ruoyi-system</module>
<module>ruoyi-workflow</module>
<module>ruoyi-order</module>
<module>ruoyi-goods</module>
<module>ruoyi-member</module>
<module>ruoyi-content</module>
<module>ruoyi-im</module>
<module>ruoyi-auth</module>
<module>ruoyi-transaction</module>
<!-- <module>ruoyi-statistics</module>-->
<module>ruoyi-statistics</module>
</modules>
<artifactId>ruoyi-modules</artifactId>

2
ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/CommentServiceImpl.java
View File

@ -358,7 +358,7 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
if (loginUser == null) {
throw new RuntimeException("未登录或登录已过期");
}
bo.setCommentUserId(String.valueOf(loginUser));
bo.setCommentUserId(String.valueOf(loginUser.getUserId()));
// 父评论为空时，按根评论处理（约定使用"0"作为无父评论标记）
if (bo.getFatherCommentId() == null || bo.getFatherCommentId().isEmpty()) {

34
ruoyi-modules/ruoyi-statistics/src/main/java/com/wzj/soopin/statistics/mapper/BillStatisticsMapper.java
View File

@ -18,38 +18,4 @@ import org.apache.ibatis.annotations.Select;
*/
public interface BillStatisticsMapper extends BaseMapper<AccountBill> {
/**
* 查询结算单分页
*
* @param page 分页
* @param queryWrapper 查询条件
* @return 结算单分页
*/
@Select("select b.id,b.sn,b.start_time,b.end_time,b.bill_status,b.store_name,b.bill_price,b.create_time from li_bill as b ${ew.customSqlSegment}")
IPage<AccountBill> queryBillPage(IPage<AccountBill> page, @Param(Constants.WRAPPER) Wrapper<AccountBill> queryWrapper);
/**
* 查询订单结算
*
* @param queryWrapper 查询条件
* @return 结算单
*/
@Select("SELECT SUM( final_price ) AS orderPrice,SUM( commission_price ) AS commissionPrice" +
",SUM( distribution_rebate ) AS distributionCommission,SUM( site_coupon_commission ) AS siteCouponCommission" +
",SUM( point_settlement_price ) AS pointSettlementPrice " +
",SUM( kanjia_settlement_price ) AS kanjiaSettlementPrice " +
",SUM( bill_price ) AS billPrice " +
"FROM li_store_flow ${ew.customSqlSegment}")
AccountBill getOrderBill(@Param(Constants.WRAPPER) QueryWrapper<AccountBill> queryWrapper);
/**
* 查询退款结算单
*
* @param queryWrapper 查询条件
* @return 结算单
*/
@Select("SELECT SUM( final_price ) AS refundPrice,SUM( commission_price ) AS refundCommissionPrice" +
",SUM( distribution_rebate ) AS distributionRefundCommission,SUM( site_coupon_commission ) AS siteCouponRefundCommission" +
",SUM( bill_price ) AS billPrice FROM li_store_flow ${ew.customSqlSegment}")
AccountBill getRefundBill(@Param(Constants.WRAPPER) QueryWrapper<AccountBill> queryWrapper);
}

9
script/docker/docker.txt
View File

@ -49,9 +49,9 @@ docker run -d \
--name java \
--restart always \
-p 8880:8080 \
-v /usr/local/docker/java/data:/java \
-v /usr/local/docker/java/logs:/logs \
-v /usr/fs/cgroup:/sys/fs/cgroup:ro \
-v /var/local/docker/java/data:/java \
-v /var/local/docker/java/logs:/logs \
-v /var/fs/cgroup:/sys/fs/cgroup:ro \
-e TZ=Asia/Shanghai \
-e JAVA_OPTS="-Xms512m -Xmx800m \
-XX:+UseContainerSupport \
@ -60,7 +60,8 @@ docker run -d \
-XX:HeapDumpPath=/var/log/java-app/heapdump.hprof \
-Dlogging.file.path=/var/log/java-app \
-Dfile.encoding=UTF-8 \
-Dprofile=prod" \
-Dprofile=dev" \
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 \
--health-interval=30s \
--health-timeout=5s \
--health-retries=3 \

151
script/docker/nginx/conf/nginx.conf
View File

@ -31,19 +31,71 @@ http {
keepalive_timeout 65;
#gzip on;
#gzip on;
server {
listen 80 default_server;
server_name "";
server_name_in_redirect off;
location / {
proxy_pass http://tj-wzjkjww.icpkuaiban.net/;
proxy_set_header Host tj-wzjkjww.icpkuaiban.net;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_redirect off;
}
}
server {
listen 8000;
server_name localhost;
listen 80;
server_name wzj.net.cn www.wzj.net.cn;
location / {
return 301 https://wzj.net.cn;
}
}
server {
listen 80;
server_name cjh.wuzhongjie.com.cn;
location / {
proxy_pass http://43.143.227.203:7002;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
}
}
server {
listen 80;
server_name fxh.wuzhongjie.com.cn;
location / {
proxy_pass http://43.143.227.203:7002;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
}
}
server {
listen 80;
server_name dev.wuzhongjie.com.cn;
location / {
proxy_pass http://43.143.227.203:7002;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
}
}
server {
listen 80;
server_name wuzhongjie.com.cn www.wuzhongjie.com.cn;
#charset koi8-r;
#access_log logs/host.access.log main;
location / {
root html ;
index index.html index.htm;
try_files $uri $uri/ /index.html;
alias /etc/nginx/html;
index index.html;
try_files $uri $uri/ /admin/index.html;
}
location /dev {
root dist ;
@ -65,6 +117,7 @@ http {
add_header Access-Control-Expose-Headers 'Content-Length,Content-Range';
}
#error_page 404 /404.html;
# redirect server error pages to the static page /50x.html
@ -115,23 +168,83 @@ http {
# HTTPS server
#
#server {
# listen 443 ssl;
# server_name localhost;
server {
listen 443 ssl;
server_name _;
ssl_certificate /etc/nginx/cert/wzjnetcn/wzj.net.cn.pem;
ssl_certificate_key /etc/nginx/cert/wzjnetcn/wzj.net.cn.key;
location / {
proxy_pass http://tj-wzjkjww.icpkuaiban.net/;
proxy_set_header Host tj-wzjkjww.icpkuaiban.net;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_redirect off;
}
# ssl_certificate cert.pem;
# ssl_certificate_key cert.key;
location ^~ /admin {
alias /etc/nginx/html;
index index.html;
try_files $uri $uri/ /admin/index.html;
# ssl_session_cache shared:SSL:1m;
# ssl_session_timeout 5m;
}
# ssl_ciphers HIGH:!aNULL:!MD5;
# ssl_prefer_server_ciphers on;
location ^~ /busniess {
alias /data/nginx/wzj/busniess/;
index index.html;
try_files $uri $uri/ /busniess/index.html;
}
# location / {
# root html;
# index index.html index.htm;
# }
#}
# app分享
location ^~ /spa {
alias /data/wzj/download/spa;
index index.html;
try_files $uri $uri/ /download/spa/index.html;
}
# app分享-接口代理
location /prod-api/ {
proxy_pass http://43.143.227:8880/;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
location /txvideo {
proxy_pass http://127.0.0.1:8888/cms/vlog/vodCallBack;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
}
server {
listen 443 ssl;
server_name _;
ssl_certificate /etc/nginx/cert/wzjnetcn/wzj.net.cn.pem;
ssl_certificate_key /etc/nginx/cert/wzjnetcn/wzj.net.cn.key;
location / {
proxy_pass http://tj-wzjkjww.icpkuaiban.net/;
proxy_set_header Host tj-wzjkjww.icpkuaiban.net;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_redirect off;
}
}
server {
listen 443 ssl;
server_name www.wzj.net.cn wzj.net.cn;
ssl_certificate /etc/nginx/cert/wzjnetcn/wzj.net.cn.pem;
ssl_certificate_key /etc/nginx/cert/wzjnetcn/wzj.net.cn.key;
location / {
proxy_pass http://tj-wzjkjww.icpkuaiban.net/;
proxy_set_header Host tj-wzjkjww.icpkuaiban.net;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_redirect off;
}
}
}