Skip to content

H
haoban-manage3.0
Commit 6d4d9622 by 墨竹
Options

feat：导购查询活码接口

parent f82bf66e
Showing with 97 additions and 35 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffClerkRelationApiService.java
......@@ -173,4 +173,16 @@ public interface StaffClerkRelationApiService {
* @date 2022-06-20 22:46:46
*/
List<StaffClerkRelationDTO> listByStaffId(String wxEnterpriseId,String staffId);
/**
* 通过职员id 查询职员id列表
*
* @param clerkIds 职员id
* @param wxEnterpriseId wx企业标识
* @return {@link List }<{@link StaffClerkRelationDTO }>
* @author mozhu
* @date 2022-07-07 17:28:01
*/
List<StaffClerkRelationDTO> listClerkIdConcatFlagByClerkIds(List<String> clerkIds,String wxEnterpriseId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/TabHaobanHmQrcodeMapper.java
......@@ -46,6 +46,7 @@ public interface TabHaobanHmQrcodeMapper {
* @return 影响行数
*/
int insertBatch(@Param("entities") List<TabHaobanHmQrcode> entities);
/**
* 修改数据
*
......@@ -72,7 +73,7 @@ public interface TabHaobanHmQrcodeMapper {
* @author mozhu
* @date 2022-07-06 13:42:07
*/
int updateStatusById(@Param("statusFlag") Integer statusFlag, @Param("hmId")Long hmId);
int updateStatusById(@Param("statusFlag") Integer statusFlag, @Param("hmId") Long hmId);
/**
* 通过职员id列表
......@@ -89,13 +90,17 @@ public interface TabHaobanHmQrcodeMapper {
/**
* 根据门店id查询
*
* @param storeId 存储id
* @param overFlag 在国旗
* @return {@link List }<{@link HmQrcodeBO }>
* @param wxEnterpriseId wx企业标识
* @param storeId 存储id
* @param overFlag 在国旗
* @return {@link List }<{@link TabHaobanHmQrcode }>
* @author mozhu
* @date 2022-07-06 16:59:49
* @date 2022-07-07 17:19:51
*/
List<TabHaobanHmQrcode> listByStoreId(@Param("storeId") String storeId,@Param("overFlag") Integer overFlag);
List<TabHaobanHmQrcode> listByStoreId(
@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("storeId") String storeId,
@Param("overFlag") Integer overFlag);
/**
* 通过id添加num
......@@ -126,5 +131,19 @@ public interface TabHaobanHmQrcodeMapper {
* @date 2022-07-07 15:55:12
*/
TabHaobanHmQrcode queryByClerkId(@Param("clerkId") String clerkId, @Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 查询职员id
*
* @param clerkId 职员id
* @param wxEnterpriseId wx企业标识
* @param overFlag 上限
* @return {@link TabHaobanHmQrcode }
* @author mozhu
* @date 2022-07-07 17:26:34
*/
TabHaobanHmQrcode queryByClerkIdAndOverFlag(@Param("clerkId") String clerkId,
@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("overFlag") Integer overFlag);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmQrcodeService.java
......@@ -71,13 +71,14 @@ public interface HmQrcodeService {
/**
* 通过门店id查询数据
*
* @param storeId 存储id
* @param overFlag 在国旗
* @param wxEnterpriseId wx企业标识
* @param storeId 存储id
* @param overFlag 在国旗
* @return {@link List }<{@link HmQrcodeBO }>
* @author mozhu
* @date 2022-07-06 17:03:30
* @date 2022-07-07 17:19:08
*/
List<HmQrcodeBO> listByStoreId(String storeId, Integer overFlag);
List<HmQrcodeBO> listByStoreId(String wxEnterpriseId,String storeId, Integer overFlag);
/**
* 通过id添加num
......@@ -102,12 +103,24 @@ public interface HmQrcodeService {
* 查询职员id活码
*
* @param clerkId 职员id
* @param WxEnterpriseId wx企业标识
* @param wxEnterpriseId wx企业标识
* @return {@link HmQrcodeBO }
* @author mozhu
* @date 2022-07-07 17:19:02
*/
HmQrcodeBO queryByClerkId(String clerkId,String wxEnterpriseId);
/**
* 查询职员id 有效
*
* @param clerkId 职员id
* @param wxEnterpriseId wx企业标识
* @param overFlag 在国旗
* @return {@link HmQrcodeBO }
* @author mozhu
* @date 2022-07-07 15:53:32
* @date 2022-07-07 17:24:57
*/
HmQrcodeBO queryByClerkId(String clerkId,String WxEnterpriseId);
HmQrcodeBO queryByClerkId(String clerkId,String wxEnterpriseId,Integer overFlag);
/**
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmQrcodeServiceImpl.java
......@@ -71,8 +71,8 @@ public class HmQrcodeServiceImpl implements HmQrcodeService {
}
@Override
public List<HmQrcodeBO> listByStoreId(String storeId, Integer overFlag) {
return EntityUtil.changeEntityListNew(HmQrcodeBO.class,tabHaobanHmQrcodeMapper.listByStoreId(storeId, overFlag));
public List<HmQrcodeBO> listByStoreId(String wxEnterpriseId,String storeId, Integer overFlag) {
return EntityUtil.changeEntityListNew(HmQrcodeBO.class,tabHaobanHmQrcodeMapper.listByStoreId(wxEnterpriseId,storeId, overFlag));
}
@Override
......@@ -86,8 +86,13 @@ public class HmQrcodeServiceImpl implements HmQrcodeService {
}
@Override
public HmQrcodeBO queryByClerkId(String clerkId, String WxEnterpriseId) {
return EntityUtil.changeEntity(HmQrcodeBO.class,tabHaobanHmQrcodeMapper.queryByClerkId(clerkId, WxEnterpriseId));
public HmQrcodeBO queryByClerkId(String clerkId, String wxEnterpriseId) {
return EntityUtil.changeEntity(HmQrcodeBO.class,tabHaobanHmQrcodeMapper.queryByClerkId(clerkId, wxEnterpriseId));
}
@Override
public HmQrcodeBO queryByClerkId(String clerkId, String wxEnterpriseId, Integer overFlag) {
return EntityUtil.changeEntity(HmQrcodeBO.class,tabHaobanHmQrcodeMapper.queryByClerkIdAndOverFlag(clerkId, wxEnterpriseId,overFlag));
}
@Override
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java
......@@ -461,4 +461,9 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
public List<StaffClerkRelationDTO> listByStaffId(String wxEnterpriseId,String staffId) {
return staffClerkRelatinService.listByStaffId(wxEnterpriseId,staffId);
}
@Override
public List<StaffClerkRelationDTO> listClerkIdConcatFlagByClerkIds(List<String> clerkIds, String wxEnterpriseId) {
return staffClerkRelatinService.listClerkIdConcatFlagByClerkIds(clerkIds, wxEnterpriseId);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkApiServiceImpl.java
package com.gic.haoban.manage.service.service.out.impl.hm;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.BasePageInfo;
......@@ -39,6 +28,16 @@ import com.gic.member.api.service.MemberService;
import com.gic.search.engine.api.dto.ESResponseQuerySingle;
import com.gic.search.engine.api.dto.dynamic.DynamicSearchDTO;
import com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
@Service("hmLinkApiService")
public class HmLinkApiServiceImpl implements HmLinkApiService {
......@@ -264,7 +263,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
}
}
if (null == hm && dy == 1) {
List<HmQrcodeBO> list = this.hmQrcodeService.listByStoreId(inStoreId, 0);
List<HmQrcodeBO> list = this.hmQrcodeService.listByStoreId(wxEnterpriseId,inStoreId, 0);
if (CollectionUtils.isNotEmpty(list)) {
hm = list.get(new Random().nextInt(list.size()));
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmQrcodeApiServiceImpl.java
......@@ -236,15 +236,17 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
@Override
public boolean delByClerkId(String clerkId, String enterpriseId) {
List<HmQrcodeBO> hmQrcodeBOS = hmQrcodeService.listByClerkId(clerkId, enterpriseId);
if (CollectionUtils.isEmpty(hmQrcodeBOS)) {
//单人活码 直接废弃，多人活码，更新
HmQrcodeBO hmQrcodeBO = hmQrcodeService.queryByClerkId(clerkId, enterpriseId);
if (hmQrcodeBO == null) {
logger.error("无活码：clerkId:{}", clerkId);
return false;
}
delById(hmQrcodeBO.getHmId());
// TODO: 2022/7/7 多人活码逻辑
for (HmQrcodeBO hmQrcodeBO : hmQrcodeBOS) {
delById(hmQrcodeBO.getHmId());
}
return true;
}
......
haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmQrcodeMapper.xml
......@@ -248,7 +248,7 @@
<select id="listByStoreId" resultMap="TabHaobanHmQrcodeMap">
select *
from tab_haoban_hm_qrcode
where store_id = #{storeId} and status_flag in (1,3)
where store_id = #{storeId} and status_flag in (1,3) and wx_enterprise_id = #{wxEnterpriseId}
<if test="overFlag != null">
and over_flag = #{overFlag}
</if>
......@@ -280,5 +280,12 @@
from tab_haoban_hm_qrcode
where clerk_id = #{clerkId} and status_flag in (1,3) and wx_enterprise_id = #{wxEnterpriseId}
</select>
<select id="queryByClerkIdAndOverFlag" resultMap="TabHaobanHmQrcodeMap">
select *
from tab_haoban_hm_qrcode
where clerk_id = #{clerkId} and status_flag = 1
and wx_enterprise_id = #{wxEnterpriseId} and over_flag = #{overFlag}
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment