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 6c82999..e037349 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 @@ -3538,10 +3538,14 @@ public class WxServiceImpl implements WxService { userMoneyDetails.setBlFlag(2); userMoneyDetailsService.save(userMoneyDetails); - String value = commonInfoService.findOne(467).getValue(); - BigDecimal rate = new BigDecimal(value); - BigDecimal artificerMoney = bMoney.multiply(rate).setScale(2,BigDecimal.ROUND_HALF_UP); - BigDecimal platformMoney = bMoney.subtract(artificerMoney); +// 允许发包时打开 +// String value = commonInfoService.findOne(467).getValue(); +// BigDecimal rate = new BigDecimal(value); +// BigDecimal artificerMoney = bMoney.multiply(rate).setScale(2,BigDecimal.ROUND_HALF_UP); +// BigDecimal platformMoney = bMoney.subtract(artificerMoney); + + BigDecimal artificerMoney = bMoney; + BigDecimal platformMoney = BigDecimal.ZERO; //技师流水 UserEntity userEntity = userService.queryByUserId(artificer.getUserId()); diff --git a/src/main/resources/mapper/bl/massage/MassagePackageDao.xml b/src/main/resources/mapper/bl/massage/MassagePackageDao.xml index dadc731..5b0966b 100644 --- a/src/main/resources/mapper/bl/massage/MassagePackageDao.xml +++ b/src/main/resources/mapper/bl/massage/MassagePackageDao.xml @@ -101,7 +101,7 @@ and a.is_tj = #{params.isTj} - + and a.is_tg = #{params.isTg} union all @@ -126,7 +126,7 @@ and a.is_tj = #{params.isTj} - + and a.is_tg = #{params.isTg} order by sales desc,id asc