feat：新增根据门店查询活码

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/TabHaobanHmQrcodeMapper.java

@@ -84,5 +84,18 @@ public interface TabHaobanHmQrcodeMapper {
      * @date 2022-07-06 15:36:20
      */
     List<HmQrcodeBO> listByClerkId(@Param("clerkId") String clerkId, @Param("enterpriseId") String enterpriseId);
+
+
+    /**
+     * 根据门店id查询
+     *
+     * @param storeId  存储id
+     * @param overFlag 在国旗
+     * @return {@link List }<{@link HmQrcodeBO }>
+     * @author mozhu
+     * @date 2022-07-06 16:59:49
+     */
+    List<HmQrcodeBO> listByStoreId(@Param("storeId") String storeId,@Param("overFlag") Integer overFlag);
+
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/TabHaobanHmClerkRelationService.java → haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmClerkRelationService.java

@@ -11,7 +11,7 @@ import java.util.List;
  * @author mozhu
  * @since 2022-07-04 15:42:20
  */
-public interface TabHaobanHmClerkRelationService {
+public interface HmClerkRelationService {
 
     /**
      * 通过ID查询单条数据

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/TabHaobanHmQrcodeService.java → haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmQrcodeService.java

@@ -14,7 +14,7 @@ import java.util.List;
  * @author mozhu
  * @since 2022-07-04 15:42:20
  */
-public interface TabHaobanHmQrcodeService {
+public interface HmQrcodeService {
 
     /**
      * 通过ID查询单条数据
@@ -67,4 +67,16 @@ public interface TabHaobanHmQrcodeService {
      */
     List<HmQrcodeBO> listByClerkId(String clerkId,String enterpriseId);
 
+
+    /**
+     * 通过门店id查询数据
+     *
+     * @param storeId  存储id
+     * @param overFlag 在国旗
+     * @return {@link List }<{@link HmQrcodeBO }>
+     * @author mozhu
+     * @date 2022-07-06 17:03:30
+     */
+    List<HmQrcodeBO> listByStoreId(String storeId, Integer overFlag);
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/TabHaobanHmClerkRelationServiceImpl.java → haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmClerkRelationServiceImpl.java

@@ -5,7 +5,7 @@ import com.gic.haoban.manage.api.dto.qdto.hm.HmClerkRelationQDTO;
 import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmClerkRelationMapper;
 import com.gic.haoban.manage.service.entity.hm.TabHaobanHmClerkRelation;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmClerkRelationBO;
-import com.gic.haoban.manage.service.service.hm.TabHaobanHmClerkRelationService;
+import com.gic.haoban.manage.service.service.hm.HmClerkRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,8 +17,8 @@ import java.util.List;
  * @author mozhu
  * @since 2022-07-04 15:42:20
  */
-@Service("tabHaobanHmClerkRelationService")
-public class TabHaobanHmClerkRelationServiceImpl implements TabHaobanHmClerkRelationService {
+@Service
+public class HmClerkRelationServiceImpl implements HmClerkRelationService {
 
     @Autowired
     private TabHaobanHmClerkRelationMapper tabHaobanHmClerkRelationMapper;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/TabHaobanHmQrcodeServiceImpl.java → haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmQrcodeServiceImpl.java

@@ -8,7 +8,7 @@ import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
 import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmQrcodeMapper;
 import com.gic.haoban.manage.service.entity.hm.TabHaobanHmQrcode;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmQrcodeBO;
-import com.gic.haoban.manage.service.service.hm.TabHaobanHmQrcodeService;
+import com.gic.haoban.manage.service.service.hm.HmQrcodeService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,8 +24,8 @@ import java.util.List;
  * @author mozhu
  * @since 2022-07-04 15:42:20
  */
-@Service("tabHaobanHmQrcodeService")
-public class TabHaobanHmQrcodeServiceImpl implements TabHaobanHmQrcodeService {
+@Service
+public class HmQrcodeServiceImpl implements HmQrcodeService {
 
     @Autowired
     private TabHaobanHmQrcodeMapper tabHaobanHmQrcodeMapper;
@@ -72,4 +72,9 @@ public class TabHaobanHmQrcodeServiceImpl implements TabHaobanHmQrcodeService {
     public List<HmQrcodeBO> listByClerkId(String clerkId, String enterpriseId) {
         return tabHaobanHmQrcodeMapper.listByClerkId(clerkId,enterpriseId);
     }
+
+    @Override
+    public List<HmQrcodeBO> listByStoreId(String storeId, Integer overFlag) {
+        return tabHaobanHmQrcodeMapper.listByStoreId(storeId,overFlag);
+    }
 }

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

@@ -157,6 +157,8 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
             clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, dto.getWxEnterpriseId());
             //推入日志
             staffClerkBindLogService.pushToMq(staffId, optStaffId, BindTypeEnum.BIND.getVal(), chanelCode, dto.getStaffClerkRelationId());
+            //绑定自动创建活码
+
         }
         return s;
     }

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

@@ -18,8 +18,8 @@ import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmQrcodeBO;
 import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
-import com.gic.haoban.manage.service.service.hm.TabHaobanHmClerkRelationService;
-import com.gic.haoban.manage.service.service.hm.TabHaobanHmQrcodeService;
+import com.gic.haoban.manage.service.service.hm.HmClerkRelationService;
+import com.gic.haoban.manage.service.service.hm.HmQrcodeService;
 import com.gic.wechat.api.dto.qywx.welcome.QywxExternalcontactDTO;
 import com.gic.wechat.api.dto.qywx.welcome.QywxExternalcontactResultDTO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
@@ -42,7 +42,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
     private static Logger logger = LoggerFactory.getLogger(HmQrcodeApiServiceImpl.class);
 
     @Autowired
-    private TabHaobanHmQrcodeService hmQrcodeService;
+    private HmQrcodeService hmQrcodeService;
     @Autowired
     private QywxUserApiService qywxUserApiService;
     @Autowired
@@ -52,7 +52,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
     @Autowired
     private StaffClerkRelationService staffClerkRelationService;
     @Autowired
-    private TabHaobanHmClerkRelationService hmClerkRelationService;
+    private HmClerkRelationService hmClerkRelationService;
     @Autowired
     private ClerkService clerkService;
 

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

@@ -242,5 +242,14 @@
         from tab_haoban_hm_qrcode
         where  enterprise_id = #{enterpriseId} and clerk_id = #{clerkId} and status_flag in (1,3)
     </select>
+
+    <select id="listByStoreId" resultMap="TabHaobanHmQrcodeMap">
+        select *
+        from tab_haoban_hm_qrcode
+        where store_id = #{storeId} and status_flag in (1,3)
+          <if test="overFlag != null">
+              and over_flag = #{overFlag}
+          </if>
+    </select>
 </mapper>