diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/ChargeServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/ChargeServiceImpl.java index f613791a4..d25444c67 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/ChargeServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/ChargeServiceImpl.java @@ -84,9 +84,9 @@ public class ChargeServiceImpl extends ServiceImpl impleme charge.setStatus(ChargeStatus.WAITING.getCode()); charge.setType(1); //手续费 - charge.setFee(new BigDecimal("0.01").multiply(charge.getMoney())); - //实际金额 - charge.setActualMoney(charge.getMoney().subtract(charge.getFee())); +// charge.setFee(new BigDecimal("0.01").multiply(charge.getMoney())); +// //实际金额 + charge.setActualMoney(charge.getMoney()); //设置充值信息 if (charge.getMemberId() == null) { diff --git a/script/docker/nginx/conf/nginx.conf b/script/docker/nginx/conf/nginx.conf index 586516173..2f8455fa6 100644 --- a/script/docker/nginx/conf/nginx.conf +++ b/script/docker/nginx/conf/nginx.conf @@ -220,6 +220,7 @@ http { location ^~ /file/ { proxy_pass http://43.143.227.203:9000/; proxy_set_header X-Real-IP $remote_addr; + client_max_body_size 100M; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } # app分享 @@ -231,6 +232,7 @@ http { # app分享-接口代理 location /prod-api/ { proxy_pass http://43.143.227.203:8880/; + client_max_body_size 100M; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; }