导粉记录部分功能

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxSaleAccount.java

@@ -44,4 +44,7 @@ public class SysWxSaleAccount extends BaseEntity
     private Integer status;
 
     private Integer useCount;
+
+    //销售昵称
+    private String saleName;
 }

stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxSaleAccountMapper.java

@@ -71,4 +71,11 @@ public interface SysWxSaleAccountMapper
     SysWxSaleAccount selectWxAdId();
 
     int insertWxAdLog(SysWxAdLog sysWxAdLog);
+
+    /**
+     * 获取可接粉的微信号以及分配的销售昵称
+     * @param sysWxSaleAccount
+     * @return
+     */
+    List<SysWxSaleAccount> getWxAccountAndSale(SysWxSaleAccount sysWxSaleAccount);
 }

stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxSaleAccountService.java

@@ -72,4 +72,11 @@ public interface ISysWxSaleAccountService
     String getWxAdId(SysWxAdLog sysWxAdLog);
 
     Integer logWxAd(SysWxAdLog sysWxAdLog);
+
+    /**
+     * 获取可接粉的微信号以及分配的销售昵称
+     * @param sysWxSaleAccount
+     * @return
+     */
+    List<SysWxSaleAccount> getWxAccountAndSale(SysWxSaleAccount sysWxSaleAccount);
 }

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java

@@ -33,7 +33,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
     private SysOrderMapper sysOrderMapper;
 
     @Autowired
-    private SysOrderPauseMapper sysOrderPauseMapper;
+    private SysOrderPauseMapper sysOrderPauseMapper    ;
 
     @Autowired
     private ISysOrderNutritionistReplaceRecordService sysOrderNutritionistReplaceRecordService;

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxSaleAccountServiceImpl.java

@@ -128,4 +128,13 @@ public class SysWxSaleAccountServiceImpl implements ISysWxSaleAccountService {
     public Integer logWxAd(SysWxAdLog sysWxAdLog) {
         return sysWxSaleAccountMapper.insertWxAdLog(sysWxAdLog);
     }
+
+    /**
+     * 获取可接粉的微信号以及分配的销售昵称
+     * @param sysWxSaleAccount
+     * @return
+     */
+    public List<SysWxSaleAccount> getWxAccountAndSale(SysWxSaleAccount sysWxSaleAccount){
+        return sysWxSaleAccountMapper.getWxAccountAndSale(sysWxSaleAccount);
+    }
 }

stdiet-custom/src/main/resources/mapper/custom/SysWxSaleAccountMapper.xml

@@ -19,6 +19,9 @@
         <result property="delFlag" column="del_flag"/>
         <result property="status" column="status"/>
         <result property="useCount" column="use_count"/>
+
+        <!-- 销售 -->
+        <result property="saleName" column="sale_name"></result>
     </resultMap>
 
     <sql id="selectSysWxSaleAccountVo">
@@ -31,6 +34,7 @@
         <if test="wxNickName != null  and wxNickName != ''">and wx_nick_name like concat('%', #{wxNickName}, '%')</if>
         <if test="wxAccount != null  and wxAccount != ''">and wx_account like concat('%', #{wxAccount}, '%')</if>
         <if test="wxPhone != null  and wxPhone != ''">and wx_phone like concat('%', #{wxPhone}, '%')</if>
+        <if test="status != null">and status = #{status}</if>
         order by id desc
     </select>
 
@@ -134,4 +138,15 @@
         </trim>
     </insert>
 
+    <!-- 查询可以接粉的微信号以及对应销售，用于导粉记录管理 -->
+    <select id="getWxAccountAndSale" parameterType="SysWxSaleAccount" resultMap="SysWxSaleAccountResult">
+        select wa.id, wa.wx_account, su.nick_name as sale_name
+        from sys_wx_sale_account wa
+        left join sys_wx_distribution swd on wa.id = swd.wechat_account and swd.del_flag = 0
+        LEFT JOIN sys_user su ON su.user_id = swd.user_id AND su.del_flag = 0
+        where wa.del_flag = 0 and wa.status = 0
+        <if test="wxAccount != null  and wxAccount != ''">and wa.wx_account like concat('%', #{wxAccount}, '%')</if>
+        order by wa.id desc
+    </select>
+
 </mapper>