| @@ -538,7 +538,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { | |||||
| return resList; | return resList; | ||||
| } | } | ||||
| private List<WxTags> assignTypeId18(WxCUserBasicInfo user) { | |||||
| private List<WxTags> assignTypeId18(WxCUserBasicInfo user,TenantEntity tenantEntity) { | |||||
| List<WxTags> resList = null; | List<WxTags> resList = null; | ||||
| final int WORK_DAY = 0; | final int WORK_DAY = 0; | ||||
| @@ -558,12 +558,14 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { | |||||
| startC.add(Calendar.DAY_OF_YEAR, -30); | startC.add(Calendar.DAY_OF_YEAR, -30); | ||||
| WxCouponOrder wxCouponOrder = new WxCouponOrder(); | WxCouponOrder wxCouponOrder = new WxCouponOrder(); | ||||
| wxCouponOrder.updateTenantInfo(tenantEntity); | |||||
| wxCouponOrder.setCUserId(user.getId()); | wxCouponOrder.setCUserId(user.getId()); | ||||
| wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); | wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); | ||||
| wxCouponOrder.setStartTime(startC.getTime()); | wxCouponOrder.setStartTime(startC.getTime()); | ||||
| wxCouponOrder.setEndTime(endC.getTime()); | wxCouponOrder.setEndTime(endC.getTime()); | ||||
| WxCardSpend wxCardSpend = new WxCardSpend(); | WxCardSpend wxCardSpend = new WxCardSpend(); | ||||
| wxCardSpend.updateTenantInfo(tenantEntity); | |||||
| wxCardSpend.setOwnerId(user.getId()); | wxCardSpend.setOwnerId(user.getId()); | ||||
| wxCardSpend.setStartdate(startC.getTime()); | wxCardSpend.setStartdate(startC.getTime()); | ||||
| wxCardSpend.setEnddate(endC.getTime()); | wxCardSpend.setEnddate(endC.getTime()); | ||||
| @@ -632,7 +634,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { | |||||
| return resList; | return resList; | ||||
| } | } | ||||
| private List<WxTags> assignTypeId22(WxCUserBasicInfo user) { | |||||
| private List<WxTags> assignTypeId22(WxCUserBasicInfo user,TenantEntity tenantEntity) { | |||||
| List<WxTags> resList = null; | List<WxTags> resList = null; | ||||
| int days = (int) ((new Date().getTime() - user.getCreateDate().getTime()) / (1000*3600*24)); | int days = (int) ((new Date().getTime() - user.getCreateDate().getTime()) / (1000*3600*24)); | ||||
| @@ -772,9 +774,9 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { | |||||
| //饮食偏好 | //饮食偏好 | ||||
| resList = assignTypeId17(user,tenantEntity); | resList = assignTypeId17(user,tenantEntity); | ||||
| //消费时段 | //消费时段 | ||||
| resList = assignTypeId18(user); | |||||
| resList = assignTypeId18(user,tenantEntity); | |||||
| //消费频度 | //消费频度 | ||||
| resList = assignTypeId22(user); | |||||
| resList = assignTypeId22(user,tenantEntity); | |||||
| } | } | ||||
| } | } | ||||
| break; | break; | ||||
| @@ -841,9 +843,9 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { | |||||
| resList = assignTypeId17(user,tenantEntity); | resList = assignTypeId17(user,tenantEntity); | ||||
| //消费时段 | //消费时段 | ||||
| resList = assignTypeId18(user); | |||||
| resList = assignTypeId18(user,tenantEntity); | |||||
| //消费频度 | //消费频度 | ||||
| resList = assignTypeId22(user); | |||||
| resList = assignTypeId22(user,tenantEntity); | |||||
| //活跃 | //活跃 | ||||
| resList = assignTypeId21(user,tenantEntity); | resList = assignTypeId21(user,tenantEntity); | ||||