diff --git a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java index ac1bceb9a..6a4184022 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java @@ -76,10 +76,11 @@ public class BaseController { } public WxMerchantBUser getUser() { - Long userId = getBuser().getUserId(); + WxBuser buser = getBuser(); + Long userId = buser.getUserId(); WxMerchantBUser user = wxMerchantBUserService.getById(userId); if (user == null) { - throw new MallinkException(ErrorCode.USER_IS_EMPTY); + throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(),"BUser[id:"+buser.getId()+",userId:"+userId+"]未查询到WxMerchantBUser。请联系管理员或者重新登陆."); } return user; } @@ -88,7 +89,7 @@ public class BaseController { Long id = getBuserId(); WxBuser user = wxBuserService.getById(id); if (user == null) { - throw new MallinkException(ErrorCode.USER_IS_EMPTY); + throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(),"BUser[id:"+id+"]未查询到记录, 请重新登陆,并完全授权微信个人信息以及手机号授权."); } return user; } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java index 1c19d066a..3ace0e8f1 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java @@ -48,21 +48,10 @@ public class WxCUserTagsSchedule { wxCUserBasicInfo.setFinalTenantId(mall.getParentTenantId()); } Date curDate = new Date(); - Calendar startC = Calendar.getInstance(); - startC.setTime(curDate); - startC.add(Calendar.DAY_OF_YEAR, -30); - - Calendar endC = Calendar.getInstance(); - endC.setTime(curDate); - endC.add(Calendar.DAY_OF_YEAR, -5); - //5天内未扫描的,且只扫描1个月内未扫描的 - wxCUserBasicInfo.setScanStartTime(startC.getTime()); - wxCUserBasicInfo.setScanEndTime(endC.getTime()); - //活跃时间在10天内的 Calendar startA = Calendar.getInstance(); startA.setTime(curDate); - startA.add(Calendar.DAY_OF_YEAR, -10); + startA.add(Calendar.DAY_OF_YEAR, -1); wxCUserBasicInfo.setActiveStartTime(startA.getTime()); wxCUserBasicInfo.setActiveEndTime(curDate); int pageIndex = 1; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index c1cb1d851..54743e1ec 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -110,13 +110,6 @@ public class WxCUserBasicInfo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "状态0正常1锁定", name = "status") private Integer status; - - @io.swagger.annotations.ApiModelProperty(value = "标签扫描时间", name = "tagScanTime") - private Date tagScanTime; - @TableField(exist = false) - private Date scanStartTime; - @TableField(exist = false) - private Date scanEndTime; @TableField(exist = false) @Excel(name="标签",width = 50,orderNum = "10") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java index e37c2d5f2..203fd4bc5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java @@ -235,8 +235,8 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { //拼团取消 //temp.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode()); - //拼团失败。定时会处理退款 - temp.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_FAILD.getCode()); + //拼团取消。定时会处理退款 + temp.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); wxOrderMapper.updateById(temp); } } diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index b132d1285..74786975b 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -26,13 +26,12 @@ - distinct wcubi.`id`,wcubi.`phone`,wcubi.`birthdate`,wcubi.`education`,wcubi.`sex`,wcubi.`email`, wcubi.`address`,wcubi.`poins`,wcubi.`tag_id`,wcubi.`create_date`,wcubi.`update_date`, - wcubi.`final_tenant_id`,wcubi.`name`,wcubi.`nick_name`,wcubi.`tag_scan_time`, + wcubi.`final_tenant_id`,wcubi.`name`,wcubi.`nick_name`, wcubi.`avatar_url`,wcubi.`credit`,wcubi.`active_time`,wcubi.`login_count`,wcubi.`act_record` ,(select level from wx_level_config where poins >= points and tenant_id=wcubi.final_tenant_id @@ -40,7 +39,7 @@ - `id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`,`tag_scan_time`, + `id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`, `create_date`,`update_date`,`tenant_id`,`parent_tenant_id`,`name`,`nick_name`,`credit`,`active_time`,`act_record` @@ -108,11 +107,7 @@ and wcubi.`create_date` between #{startTime} and #{endTime} - - - - and wcubi.`tag_scan_time` between #{scanStartTime} and #{scanEndTime} - + and wcubi.`active_time` between #{activeStartTime} and #{activeEndTime} @@ -210,10 +205,6 @@ and wcubi.`create_date` between #{basicInfo.startTime} and #{basicInfo.endTime} - - - - and wcubi.`tag_scan_time` between #{basicInfo.scanStartTime} and #{basicInfo.scanEndTime} @@ -406,7 +397,7 @@ distinct cub.id,cub.phone,cub.birthdate,cub.education,cub.sex,cub.email,cub.address,cub.poins,cub.tag_id, - cub.create_date,cub.update_date,cub.name,cub.level,cub.nick_name,cub.score_date,cub.final_tenant_id,cub.tag_scan_time + cub.create_date,cub.update_date,cub.name,cub.level,cub.nick_name,cub.score_date,cub.final_tenant_id