Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmQrcodeTempServiceImpl.java

 package com.gic.haoban.manage.service.service.hm.impl;
 
 import java.util.Date;
+import java.util.List;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.UniqueIdUtils;
+import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.hm.HmQrcodeTempMapper;
 import com.gic.haoban.manage.service.entity.hm.TabHmQrcodeTemp;
 import com.gic.haoban.manage.service.pojo.qo.HmQrcodeTempQO;
 import com.gic.haoban.manage.service.service.hm.HmQrcodeTempService;
+import com.gic.wechat.api.service.qywx.QywxUserApiService;
 
 @Service
 public class HmQrcodeTempServiceImpl implements HmQrcodeTempService {
 
     @Autowired
     private HmQrcodeTempMapper hmQrcodeTempMapper;
+    @Autowired
+    private QywxUserApiService qywxUserApiService;
+    @Autowired
+    private Config config;
+    
 
     @Override
     public void save(HmQrcodeTempQO qo) {
@@ -38,4 +47,12 @@ public class HmQrcodeTempServiceImpl implements HmQrcodeTempService {
         this.hmQrcodeTempMapper.deleteByPrimaryKey(id);
     }
 
+    public void del() {
+        List<TabHmQrcodeTemp> list = this.hmQrcodeTempMapper.listAll();
+        if (CollectionUtils.isEmpty(list)) {
+            
+            //this.qywxUserApiService.delContactWay(corpid, suiteId, configId) ;
+        }
+    }
+
 }

haoban-manage3-service/src/main/resources/mapper/hm/HmQrcodeTempMapper.xml

@@ -60,6 +60,6 @@
 	</select>
 
 	<select id="listAll" resultMap="result-map-tabHaobanHmQrcodeTemp">
-		select * from tab_haoban_hm_qrcode_temp
+		select * from tab_haoban_hm_qrcode_temp where create_time >= DATE_ADD(now(),INTERVAL 6 HOUR) and  status_flag = 1
 	</select>
 </mapper> 
\ No newline at end of file