From 53a40794d60ff61eb061355ad6d2c85a1765cc9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 25 Mar 2025 14:33:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=83=A8=E9=A1=B9=E7=9B=AE=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqx/modules/pay/service/impl/WxServiceImpl.java  | 12 ++++++++----
 .../mapper/bl/massage/MassagePackageDao.xml          |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

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 @@
         <if test="params.isTj!=null">
             and a.is_tj = #{params.isTj}
         </if>
-        <if test="params.type!=null">
+        <if test="params.isTg!=null">
             and a.is_tg = #{params.isTg}
         </if>
         union all
@@ -126,7 +126,7 @@
         <if test="params.isTj!=null">
             and a.is_tj = #{params.isTj}
         </if>
-        <if test="params.type!=null">
+        <if test="params.isTg!=null">
             and a.is_tg = #{params.isTg}
         </if>
         order by sales desc,id asc