优化物业通知，查重问题

java110-db/src/main/resources/mapper/user/WechatSubscribeV1ServiceDaoImplMapper.xml

@@ -33,6 +33,43 @@
     </insert>
 
 
+
+    <select id="queryDistinctWechatSubscribes" parameterType="Map" resultType="Map">
+        select distinct t.open_id,t.open_id openId,t.app_id,t.app_id
+        appId,t.nickname,t.headimgurl,t.status_cd,t.status_cd statusCd,t.user_id,t.user_id
+        userId,t.open_type,t.open_type openType
+        from wechat_subscribe t
+        where 1 =1
+        <if test="subId !=null and subId != ''">
+            and t.sub_id= #{subId}
+        </if>
+        <if test="openId !=null and openId != ''">
+            and t.open_id= #{openId}
+        </if>
+        <if test="appId !=null and appId != ''">
+            and t.app_id= #{appId}
+        </if>
+        <if test="nickname !=null and nickname != ''">
+            and t.nickname= #{nickname}
+        </if>
+        <if test="headimgurl !=null and headimgurl != ''">
+            and t.headimgurl= #{headimgurl}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="openType !=null and openType != ''">
+            and t.open_type= #{openType}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
     <!-- 查询微信关注信息 add by wuxw 2018-07-03 -->
     <select id="getWechatSubscribeInfo" parameterType="Map" resultType="Map">
         select t.sub_id,t.sub_id subId,t.open_id,t.open_id openId,t.app_id,t.app_id

java110-interface/src/main/java/com/java110/intf/user/IWechatSubscribeV1InnerServiceSMO.java

@@ -59,6 +59,15 @@ public interface IWechatSubscribeV1InnerServiceSMO {
      */
     @RequestMapping(value = "/queryWechatSubscribes", method = RequestMethod.POST)
     List<WechatSubscribeDto> queryWechatSubscribes(@RequestBody WechatSubscribeDto wechatSubscribeDto);
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param wechatSubscribeDto 数据对象分享
+     * @return WechatSubscribeDto 对象数据
+     */
+    @RequestMapping(value = "/queryDistinctWechatSubscribes", method = RequestMethod.POST)
+    List<WechatSubscribeDto> queryDistinctWechatSubscribes(@RequestBody WechatSubscribeDto wechatSubscribeDto);
 
     /**
      * 查询<p>小区楼</p>总记录数

service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java

@@ -232,16 +232,16 @@ public class PayFeeCmd extends AbstractServiceCmdListener {
             }
         }
 
-        //根据明细ID 查询收据信息
+//        //根据明细ID 查询收据信息
         FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
         feeReceiptDetailDto.setDetailId(paramObj.getString("detailId"));
-        feeReceiptDetailDto.setCommunityId(paramObj.getString("communityId"));
-        List<FeeReceiptDetailDto> feeReceiptDetailDtos = feeReceiptDetailInnerServiceSMOImpl.queryFeeReceiptDetails(feeReceiptDetailDto);
-
-        if (feeReceiptDetailDtos != null && feeReceiptDetailDtos.size() > 0) {
-            cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDtos.get(0)));
-            return;
-        }
+//        feeReceiptDetailDto.setCommunityId(paramObj.getString("communityId"));
+//        List<FeeReceiptDetailDto> feeReceiptDetailDtos = feeReceiptDetailInnerServiceSMOImpl.queryFeeReceiptDetails(feeReceiptDetailDto);
+//
+//        if (feeReceiptDetailDtos != null && feeReceiptDetailDtos.size() > 0) {
+//            cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDtos.get(0)));
+//            return;
+//        }
 
         cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDto));
     }

service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java

@@ -347,7 +347,7 @@ public class WeChatPushMessageTemplate extends TaskSystemQuartz {
             getAllOpenId(accessToken, "", weChatDto);
         }
 
-        List<WechatSubscribeDto> wechatSubscribeDtos = wechatSubscribeV1InnerServiceSMOImpl.queryWechatSubscribes(wechatSubscribeDto);
+        List<WechatSubscribeDto> wechatSubscribeDtos = wechatSubscribeV1InnerServiceSMOImpl.queryDistinctWechatSubscribes(wechatSubscribeDto);
 
         if (wechatSubscribeDtos == null || wechatSubscribeDtos.size() < 1) {
             return;

service-user/src/main/java/com/java110/user/dao/IWechatSubscribeV1ServiceDao.java

@@ -61,6 +61,17 @@ public interface IWechatSubscribeV1ServiceDao {
 
 
 
+    /**
+     * 查询微信关注信息（instance过程）
+     * 根据bId 查询微信关注信息
+     * @param info bId 信息
+     * @return 微信关注信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> queryDistinctWechatSubscribes(Map info) throws DAOException;
+
+
+
     /**
      * 修改微信关注信息
      * @param info 修改信息

service-user/src/main/java/com/java110/user/dao/impl/WechatSubscribeV1ServiceDaoImpl.java

@@ -83,6 +83,20 @@ public class WechatSubscribeV1ServiceDaoImpl extends BaseServiceDao implements I
 
         return businessWechatSubscribeInfos;
     }
+    /**
+     * 查询微信关注信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> queryDistinctWechatSubscribes(Map info) throws DAOException {
+        logger.debug("查询 queryDistinctWechatSubscribes 入参 info : {}",info);
+
+        List<Map> businessWechatSubscribeInfos = sqlSessionTemplate.selectList("wechatSubscribeV1ServiceDaoImpl.queryDistinctWechatSubscribes",info);
+
+        return businessWechatSubscribeInfos;
+    }
 
 
     /**

service-user/src/main/java/com/java110/user/smo/impl/WechatSubscribeV1InnerServiceSMOImpl.java

@@ -99,6 +99,19 @@ public class WechatSubscribeV1InnerServiceSMOImpl extends BaseServiceSMO impleme
 
         return wechatSubscribes;
     }
+    @Override
+    public List<WechatSubscribeDto> queryDistinctWechatSubscribes(@RequestBody WechatSubscribeDto wechatSubscribeDto) {
+        //校验是否传了 分页信息
+        int page = wechatSubscribeDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            wechatSubscribeDto.setPage((page - 1) * wechatSubscribeDto.getRow());
+        }
+
+        List<WechatSubscribeDto> wechatSubscribes = BeanConvertUtil.covertBeanList(wechatSubscribeV1ServiceDaoImpl.queryDistinctWechatSubscribes(BeanConvertUtil.beanCovertMap(wechatSubscribeDto)), WechatSubscribeDto.class);
+
+        return wechatSubscribes;
+    }
 
 
     @Override