fixed 云打印、会员数量统计

fuint-application/src/main/java/com/fuint/common/service/impl/PrinterServiceImpl.java

@@ -216,8 +216,8 @@ public class PrinterServiceImpl extends ServiceImpl<MtPrinterMapper, MtPrinter>
 
             printContent.append("<BR>");
             printContent.append("<L>")
-                    .append("店铺地址：").append((orderInfo.getStoreInfo().getAddress() == null) ? "" : orderInfo.getStoreInfo().getAddress()).append("<BR>")
-                    .append("联系电话：").append((orderInfo.getStoreInfo().getPhone() == null) ? "" : orderInfo.getStoreInfo().getPhone()).append("<BR>")
+                    .append("店铺地址：").append((orderInfo.getStoreInfo().getAddress() == null) ? "无" : orderInfo.getStoreInfo().getAddress()).append("<BR>")
+                    .append("联系电话：").append((orderInfo.getStoreInfo().getPhone() == null) ? "无" : orderInfo.getStoreInfo().getPhone()).append("<BR>")
                     .append("下单时间：").append(orderInfo.getCreateTime()).append("<BR>")
                     .append("订单备注：").append(StringUtil.isEmpty(orderInfo.getRemark()) ? "无" : orderInfo.getRemark()).append("<BR>");
 

fuint-repository/src/main/resources/mapper/MtUserMapper.xml

@@ -53,29 +53,29 @@
     </update>
 
     <select id="getUserCount" resultType="java.lang.Long">
-        select count(*) from mt_user t where t.STATUS != 'D'
+        select count(*) from mt_user t where t.STATUS != 'D' and t.IS_STAFF = 'N'
         <if test="merchantId != null and merchantId > 0">
             AND t.MERCHANT_ID = #{merchantId}
         </if>
     </select>
 
     <select id="getStoreUserCount" resultType="java.lang.Long">
-        select count(*) from mt_user t where t.STORE_ID = #{storeId} and t.STATUS != 'D'
+        select count(*) from mt_user t where t.STORE_ID = #{storeId} and t.STATUS != 'D' and t.IS_STAFF = 'N'
     </select>
 
     <select id="getUserCountByTime" resultType="java.lang.Long">
-        select count(*) from mt_user t where t.CREATE_TIME &gt;= #{beginTime} and t.CREATE_TIME &lt; #{endTime} and t.STATUS != 'D'
+        select count(*) from mt_user t where t.CREATE_TIME &gt;= #{beginTime} and t.CREATE_TIME &lt; #{endTime} and t.STATUS != 'D' and t.IS_STAFF = 'N'
         <if test="merchantId != null and merchantId > 0">
             AND t.MERCHANT_ID = #{merchantId}
         </if>
     </select>
 
     <select id="getStoreUserCountByTime" resultType="java.lang.Long">
-        select count(*) from mt_user t where t.STORE_ID = #{storeId} and t.CREATE_TIME &lt; #{endTime} and t.CREATE_TIME &gt;= #{beginTime} and t.STATUS != 'D'
+        select count(*) from mt_user t where t.STORE_ID = #{storeId} and t.CREATE_TIME &lt; #{endTime} and t.CREATE_TIME &gt;= #{beginTime} and t.STATUS != 'D' and t.IS_STAFF = 'N'
     </select>
 
     <select id="getMemberConsumeTopList" resultType="com.fuint.repository.bean.MemberTopBean">
-        SELECT u.id AS ID,u.name AS NAME,u.`USER_NO`,SUM(o.`AMOUNT`) AS amount FROM `mt_user` u,`mt_order` o WHERE u.`ID` = o.`USER_ID` AND u.STATUS = 'A' AND o.STATUS != 'G' AND o.PAY_STATUS = 'B'
+        SELECT u.id AS ID,u.name AS NAME,u.`USER_NO`,SUM(o.`AMOUNT`) AS amount FROM `mt_user` u,`mt_order` o WHERE u.`ID` = o.`USER_ID` AND u.STATUS = 'A' AND u.IS_STAFF = 'N' AND o.STATUS != 'G' AND o.PAY_STATUS = 'B'
         <if test="merchantId != null and merchantId > 0">
             AND u.MERCHANT_ID = #{merchantId}
         </if>