Commit 62a5368c by 徐高华

test

parent 20b9a9ff
...@@ -126,7 +126,7 @@ public class WxStaffController extends WebBaseController { ...@@ -126,7 +126,7 @@ public class WxStaffController extends WebBaseController {
List<StaffVO> resultList = new ArrayList<>(); List<StaffVO> resultList = new ArrayList<>();
for (StaffDTO staffDTO : resultlist) { for (StaffDTO staffDTO : resultlist) {
String enterpriseId = staffDTO.getEnterpriseId(); String enterpriseId = staffDTO.getEnterpriseId();
long memberCount = customerApiService.countMember(enterpriseId, storeId, clerkId); long memberCount = customerApiService.countMember(enterpriseId, storeId, staffDTO.getClerkId());
logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},memberCount={}", enterpriseId, staffDTO.getClerkId(), storeId, memberCount); logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},memberCount={}", enterpriseId, staffDTO.getClerkId(), storeId, memberCount);
staffDTO.setMemberCount(Convert.toInt(memberCount, 0)); staffDTO.setMemberCount(Convert.toInt(memberCount, 0));
resultList.add(EntityUtil.changeEntityNew(StaffVO.class, staffDTO)); resultList.add(EntityUtil.changeEntityNew(StaffVO.class, staffDTO));
...@@ -538,23 +538,10 @@ public class WxStaffController extends WebBaseController { ...@@ -538,23 +538,10 @@ public class WxStaffController extends WebBaseController {
@RequestMapping("/set-main-store") @RequestMapping("/set-main-store")
public HaobanResponse setMainStore(String staffId, String storeId, String wxEnterpriseId, String dateStr) { public HaobanResponse setMainStore(String staffId, String storeId, String wxEnterpriseId, String dateStr) {
StaffDTO staff = staffApiService.selectById(staffId); StaffDTO staff = staffApiService.selectById(staffId);
Date curDate = new Date();
if (staff == null) { if (staff == null) {
return resultResponse(HaoBanErrCode.ERR_10006); return resultResponse(HaoBanErrCode.ERR_10006);
} }
//给测试使用 this.clerkMainStoreRelatedApiService.setMainStore(staffId, storeId, wxEnterpriseId);
if (StringUtils.isNotBlank(dateStr)) {
curDate = cn.hutool.core.date.DateUtil.parse(dateStr);
}
int i = cn.hutool.core.date.DateUtil.weekOfYear(curDate);
String key = "haoban_set_main_store_" + i + ":" + staffId;
Object hasSet = RedisUtil.getCache(key);
if (hasSet == null) {
RedisUtil.setCache(key, true, 7 * 24 * 60 * 60L);
clerkMainStoreRelatedApiService.setMainStore(staffId, storeId, wxEnterpriseId);
} else {
return resultResponse(HaoBanErrCode.ERR_10031);
}
return resultResponse(HaoBanErrCode.ERR_1); return resultResponse(HaoBanErrCode.ERR_1);
} }
...@@ -563,25 +550,7 @@ public class WxStaffController extends WebBaseController { ...@@ -563,25 +550,7 @@ public class WxStaffController extends WebBaseController {
@HttpLimit @HttpLimit
@RequestMapping("/check-main-store") @RequestMapping("/check-main-store")
public HaobanResponse checkMainStore(String staffId, String storeId, String wxEnterpriseId, String dateStr) { public HaobanResponse checkMainStore(String staffId, String storeId, String wxEnterpriseId, String dateStr) {
StaffDTO staff = staffApiService.selectById(staffId); return resultResponse(HaoBanErrCode.ERR_1, 1);
Date curDate = new Date();
if (staff == null) {
return resultResponse(HaoBanErrCode.ERR_10006);
}
//给测试使用
if (StringUtils.isNotBlank(dateStr)) {
curDate = cn.hutool.core.date.DateUtil.parse(dateStr);
}
int i = cn.hutool.core.date.DateUtil.weekOfYear(curDate);
String key = "haoban_set_main_store_" + i + ":" + staffId;
Object hasSet = RedisUtil.getCache(key);
if (hasSet == null) {
//可修改
return resultResponse(HaoBanErrCode.ERR_1, 1);
} else {
//不可以设置
return resultResponse(HaoBanErrCode.ERR_1, 0);
}
} }
......
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