diff --git a/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java b/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java
index d00c16a..41c911e 100644
--- a/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java
+++ b/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java
@@ -21,7 +21,8 @@ public interface ArtificerDao extends BaseMapper<Artificer> {
                                          @Param("latitude")String latitude,@Param("sort") Integer sort,
                                          @Param("authentication") Integer authentication,@Param("by") Integer by,
                                          @Param("status") Integer status,@Param("city") String city,
-                                         @Param("classifyId") Long classifyId,@Param("phone") String phone,Integer user,@Param("isStart") Integer isStart);
+                                         @Param("classifyId") Long classifyId,@Param("phone") String phone,
+                                         Integer user,@Param("isStart") Integer isStart,@Param("technicianType")Integer technicianType);
 
     Artificer selectArtificerById(@Param("userId") Long userId,@Param("artificerId") Long artificerId,@Param("longitude") String longitude,@Param("latitude") String latitude);
 
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 173a779..aa7fa05 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
@@ -1240,6 +1240,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",订单取消！");
                 userMoneyDetails.setTitle("推广用户收益");
                 userMoneyDetails.setType(1);
+                userMoneyDetails.setState(2);
                 userMoneyDetails.setClassify(5);
                 userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
                 userMoneyDetails.setBlRole(1);
@@ -1265,6 +1266,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",订单取消！");
                 userMoneyDetails.setTitle("推广师傅收益");
                 userMoneyDetails.setType(1);
+                userMoneyDetails.setState(2);
                 userMoneyDetails.setClassify(6);
                 userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
                 userMoneyDetails.setBlRole(2);
@@ -1289,6 +1291,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",订单取消！");
                 userMoneyDetails.setTitle("商家收益");
                 userMoneyDetails.setType(1);
+                userMoneyDetails.setState(2);
                 userMoneyDetails.setClassify(7);
                 userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
                 userMoneyDetails.setBlRole(3);
@@ -3506,37 +3509,41 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
             userMoneyDetails.setManipulateType(2);
             userMoneyDetails.setMoney(orders.getSumArtificerMoney());
             userMoneyDetails.setUserId(userEntity.getUserId());
-            userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",订单完成！");
+            userMoneyDetails.setTitle("订单号：" + orders.getOrdersNo() + ",订单完成！");
             String value = commonInfoService.findOne(394).getValue();
             if ("是".equals(value)) {
                 if (orders.getShopUserId() != null) {
-                    userMoneyDetails.setTitle("支付金额：" + orders.getSumMoney() + "，平台扣除：" + orders.getPingMoney() +
+                    userMoneyDetails.setContent("支付金额：" + orders.getSumMoney() + "，平台扣除：" + orders.getPingMoney() +
                             "，商家扣除：" + orders.getShopMoney() + "，用户代理扣除：" + orders.getOneUserMoney() + "，技师代理扣除：" + orders.getOneArtificerMoney() +
                             "，打车费：" + orders.getTaxiMoney() + "，平台扣除打车费：" + orders.getPingTaxiMoney() + "，到账打车费：" + orders.getArtificerTaxiMoney() +
                             "，到账总金额：" + orders.getSumArtificerMoney());
                 } else {
-                    userMoneyDetails.setTitle("支付金额：" + orders.getSumMoney() + "，平台扣除：" + orders.getPingMoney() +
+                    userMoneyDetails.setContent("支付金额：" + orders.getSumMoney() + "，平台扣除：" + orders.getPingMoney() +
                             "，用户代理扣除：" + orders.getOneUserMoney() + "，技师代理扣除：" + orders.getOneArtificerMoney() +
                             "，打车费：" + orders.getTaxiMoney() + "，平台扣除打车费：" + orders.getPingTaxiMoney() + "，到账打车费：" + orders.getArtificerTaxiMoney() +
                             "，到账总金额：" + orders.getSumArtificerMoney());
                 }
             } else {
                 if (orders.getShopUserId() != null) {
-                    userMoneyDetails.setTitle("支付金额：" + orders.getSumMoney() + "，平台扣除：" + orders.getPingMoney() +
+                    userMoneyDetails.setContent("支付金额：" + orders.getSumMoney() + "，平台扣除：" + orders.getPingMoney() +
                             "，商家扣除：" + orders.getShopMoney() + "，用户代理扣除：" + orders.getOneUserMoney() + "，技师代理扣除：" + orders.getOneArtificerMoney() +
                             "，打车费：" + orders.getTaxiMoney() +
                             "，到账总金额：" + orders.getSumArtificerMoney());
                 } else {
-                    userMoneyDetails.setTitle("支付金额：" + orders.getSumMoney() + "，平台扣除：" + orders.getPingMoney() +
+                    userMoneyDetails.setContent("支付金额：" + orders.getSumMoney() + "，平台扣除：" + orders.getPingMoney() +
                             "，用户代理扣除：" + orders.getOneUserMoney() + "，技师代理扣除：" + orders.getOneArtificerMoney() +
                             "，打车费：" + orders.getTaxiMoney() +
                             "，到账总金额：" + orders.getSumArtificerMoney());
                 }
             }
             userMoneyDetails.setType(1);
+            userMoneyDetails.setState(2);
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
+            userMoneyDetails.setBlRole(2);
+            userMoneyDetails.setBlFlag(1);
             userMoneyDetailsService.save(userMoneyDetails);
+
             //--------添加钱包流水日志-------------
 
             orders.setStatus(3);
@@ -3558,8 +3565,11 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",订单完成！");
                 userMoneyDetails.setTitle("推广用户收益");
                 userMoneyDetails.setType(1);
+                userMoneyDetails.setState(2);
                 userMoneyDetails.setClassify(5);
                 userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
+                userMoneyDetails.setBlRole(1);
+                userMoneyDetails.setBlFlag(1);
                 userMoneyDetailsService.save(userMoneyDetails);
                 orders.setOneUserId(oneUser.getUserId());
                 orders.setOneUserName(oneUser.getUserName());
@@ -3580,8 +3590,11 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",订单完成！");
                 userMoneyDetails.setTitle("推广师傅收益");
                 userMoneyDetails.setType(1);
+                userMoneyDetails.setState(2);
                 userMoneyDetails.setClassify(6);
                 userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
+                userMoneyDetails.setBlRole(2);
+                userMoneyDetails.setBlFlag(1);
                 userMoneyDetailsService.save(userMoneyDetails);
                 orders.setOneArtificerUserId(oneArtificerUser.getUserId());
                 orders.setOneArtificerUserName(oneArtificerUser.getUserName());
@@ -3600,8 +3613,11 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",订单完成！");
                 userMoneyDetails.setTitle("商家收益");
                 userMoneyDetails.setType(1);
+                userMoneyDetails.setState(2);
                 userMoneyDetails.setClassify(7);
                 userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
+                userMoneyDetails.setBlRole(3);
+                userMoneyDetails.setBlFlag(1);
                 userMoneyDetailsService.save(userMoneyDetails);
             }
             orders.setEndTimes(DateUtils.format(new Date()));
diff --git a/src/main/resources/mapper/artificer/ArtificerDao.xml b/src/main/resources/mapper/artificer/ArtificerDao.xml
index ddb91a1..6cfb89a 100644
--- a/src/main/resources/mapper/artificer/ArtificerDao.xml
+++ b/src/main/resources/mapper/artificer/ArtificerDao.xml
@@ -26,6 +26,9 @@
         <if test="classifyId!=null and classifyId!=0">
             and classify_id=#{classifyId}
         </if>
+        <if test="technicianType!=null and technicianType!=0">
+            and a.technician_type=#{technicianType}
+        </if>
         <if test="massageTypeId!=null">
             and a.artificer_id in (select artificer_id from artificer_massage where massage_type_id =#{massageTypeId})
         </if>