From c0e08c9ed6d0a16475057c0da421b470d6622c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 16 Aug 2024 14:41:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=88=86=E4=BD=A3=E5=9B=9B?= =?UTF-8?q?=E8=88=8D=E4=BA=94=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrdersServiceImpl.java | 18 +++++++++--------- .../pay/controller/app/AliPayController.java | 4 ++-- .../pay/service/impl/WxServiceImpl.java | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index 24a4877..7159886 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -1337,7 +1337,7 @@ public class OrdersServiceImpl extends ServiceImpl implements // ordersOld.setOneArtificerUserId(oneArtificerUser.getUserId()); // ordersOld.setOneArtificerUserName(oneArtificerUser.getUserName()); // oneArtificerMoney = artificerPrice.multiply(oneArtificerUser.getShopRate()); -// oneArtificerMoney = oneArtificerMoney.setScale(0, BigDecimal.ROUND_HALF_UP); +// oneArtificerMoney = oneArtificerMoney.setScale(2, BigDecimal.ROUND_HALF_UP); // } // ordersOld.setOneArtificerMoney(oneArtificerMoney); @@ -2024,7 +2024,7 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setShopUserId(consortiaUser.getUserId()); orders.setShopUserName(consortiaUser.getUserName()); shopMoney = artificerPrice.multiply(consortia.getRate()); - shopMoney = shopMoney.setScale(0, BigDecimal.ROUND_HALF_UP); + shopMoney = shopMoney.setScale(2, BigDecimal.ROUND_HALF_UP); } } } @@ -2036,7 +2036,7 @@ public class OrdersServiceImpl extends ServiceImpl implements // orders.setOneUserId(oneUser.getUserId()); // orders.setOneUserName(oneUser.getUserName()); // oneUserMoney = artificerPrice.multiply(oneUser.getUserRate()); -// oneUserMoney = oneUserMoney.setScale(0, BigDecimal.ROUND_HALF_UP); +// oneUserMoney = oneUserMoney.setScale(2, BigDecimal.ROUND_HALF_UP); // } // orders.setOneUserMoney(oneUserMoney); @@ -2382,7 +2382,7 @@ public class OrdersServiceImpl extends ServiceImpl implements ordersOld.setShopUserId(consortiaUser.getUserId()); ordersOld.setShopUserName(consortiaUser.getUserName()); shopMoney = oldArtificerPrice.multiply(consortia.getRate()); - shopMoney = shopMoney.setScale(0, BigDecimal.ROUND_HALF_UP); + shopMoney = shopMoney.setScale(2, BigDecimal.ROUND_HALF_UP); } } } @@ -2394,7 +2394,7 @@ public class OrdersServiceImpl extends ServiceImpl implements // ordersOld.setOneUserId(oneUser.getUserId()); // ordersOld.setOneUserName(oneUser.getUserName()); // oneUserMoney = oldArtificerPrice.multiply(oneUser.getUserRate()); -// oneUserMoney = oneUserMoney.setScale(0, BigDecimal.ROUND_HALF_UP); +// oneUserMoney = oneUserMoney.setScale(2, BigDecimal.ROUND_HALF_UP); // } // ordersOld.setOneUserMoney(oneUserMoney); @@ -2933,7 +2933,7 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setShopUserId(consortiaUser.getUserId()); orders.setShopUserName(consortiaUser.getUserName()); shopMoney = artificerMoney.multiply(consortia.getRate()); - shopMoney = shopMoney.setScale(0, BigDecimal.ROUND_HALF_UP); + shopMoney = shopMoney.setScale(2, BigDecimal.ROUND_HALF_UP); } } } @@ -2945,7 +2945,7 @@ public class OrdersServiceImpl extends ServiceImpl implements // orders.setOneUserId(oneUser.getUserId()); // orders.setOneUserName(oneUser.getUserName()); // oneUserMoney = artificerMoney.multiply(oneUser.getUserRate()); -// oneUserMoney = oneUserMoney.setScale(0, BigDecimal.ROUND_HALF_UP); +// oneUserMoney = oneUserMoney.setScale(2, BigDecimal.ROUND_HALF_UP); // } // orders.setOneUserMoney(oneUserMoney); @@ -6054,7 +6054,7 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setShopUserId(consortiaUser.getUserId()); orders.setShopUserName(consortiaUser.getUserName()); shopMoney = artificerPrice.multiply(consortia.getRate()); - shopMoney = shopMoney.setScale(0, BigDecimal.ROUND_HALF_UP); + shopMoney = shopMoney.setScale(2, BigDecimal.ROUND_HALF_UP); } } } @@ -6066,7 +6066,7 @@ public class OrdersServiceImpl extends ServiceImpl implements // orders.setOneUserId(oneUser.getUserId()); // orders.setOneUserName(oneUser.getUserName()); // oneUserMoney = artificerPrice.multiply(oneUser.getUserRate()); -// oneUserMoney = oneUserMoney.setScale(0, BigDecimal.ROUND_HALF_UP); +// oneUserMoney = oneUserMoney.setScale(2, BigDecimal.ROUND_HALF_UP); // } // orders.setOneUserMoney(oneUserMoney); diff --git a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java index 2e840fb..b49c2fc 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java @@ -1862,7 +1862,7 @@ public class AliPayController { // orders.setOneUserId(oneUser.getUserId()); // orders.setOneUserName(oneUser.getUserName()); // oneUserMoney = artificerPrice.multiply(oneUser.getUserRate()); -// oneUserMoney = oneUserMoney.setScale(0, BigDecimal.ROUND_HALF_UP); +// oneUserMoney = oneUserMoney.setScale(2, BigDecimal.ROUND_HALF_UP); // } // orders.setOneUserMoney(oneUserMoney); @@ -2401,7 +2401,7 @@ public class AliPayController { //// orders.setOneArtificerUserId(oneArtificerUser.getUserId()); //// orders.setOneArtificerUserName(oneArtificerUser.getUserName()); //// oneArtificerMoney = artificerPrice.multiply(oneArtificerUser.getShopRate()); -//// oneArtificerMoney = oneArtificerMoney.setScale(0, BigDecimal.ROUND_HALF_UP); +//// oneArtificerMoney = oneArtificerMoney.setScale(2, BigDecimal.ROUND_HALF_UP); //// } //// orders.setOneArtificerMoney(oneArtificerMoney); // diff --git a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java index aee5cf9..ca48e95 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java @@ -1699,7 +1699,7 @@ public class WxServiceImpl implements WxService { // orders.setShopUserId(consortiaUser.getUserId()); // orders.setShopUserName(consortiaUser.getUserName()); // shopMoney = artificerPrice.multiply(consortia.getRate()); -// shopMoney = shopMoney.setScale(0, BigDecimal.ROUND_HALF_UP); +// shopMoney = shopMoney.setScale(2, BigDecimal.ROUND_HALF_UP); // } // } // } @@ -1711,7 +1711,7 @@ public class WxServiceImpl implements WxService { //// orders.setOneUserId(oneUser.getUserId()); //// orders.setOneUserName(oneUser.getUserName()); //// oneUserMoney = artificerPrice.multiply(oneUser.getUserRate()); -//// oneUserMoney = oneUserMoney.setScale(0, BigDecimal.ROUND_HALF_UP); +//// oneUserMoney = oneUserMoney.setScale(2, BigDecimal.ROUND_HALF_UP); //// } //// orders.setOneUserMoney(oneUserMoney); // @@ -2711,7 +2711,7 @@ public class WxServiceImpl implements WxService { orders.setShopUserId(consortiaUser.getUserId()); orders.setShopUserName(consortiaUser.getUserName()); shopMoney = artificerPrice.multiply(consortia.getRate()); - shopMoney = shopMoney.setScale(0, BigDecimal.ROUND_HALF_UP); + shopMoney = shopMoney.setScale(2, BigDecimal.ROUND_HALF_UP); } } } @@ -2723,7 +2723,7 @@ public class WxServiceImpl implements WxService { // orders.setOneUserId(oneUser.getUserId()); // orders.setOneUserName(oneUser.getUserName()); // oneUserMoney = artificerPrice.multiply(oneUser.getUserRate()); -// oneUserMoney = oneUserMoney.setScale(0, BigDecimal.ROUND_HALF_UP); +// oneUserMoney = oneUserMoney.setScale(2, BigDecimal.ROUND_HALF_UP); // } // orders.setOneUserMoney(oneUserMoney);