|
|
|
@@ -6,10 +6,7 @@ import com.github.pagehelper.PageHelper; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.IdWorker; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.enums.EnumAssignTagsTrigger; |
|
|
|
import com.iformall.enums.EnumCUserBaseInfoSex; |
|
|
|
import com.iformall.enums.EnumTag; |
|
|
|
import com.iformall.enums.EnumTagTypeFlag; |
|
|
|
import com.iformall.enums.*; |
|
|
|
import com.iformall.mapper.*; |
|
|
|
import com.iformall.service.WxCUserTagsService; |
|
|
|
import com.iformall.service.WxTagsService; |
|
|
|
@@ -35,6 +32,9 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { |
|
|
|
@Autowired |
|
|
|
WxCouponOrderMapper wxCouponOrderMapper; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxCardSpendMapper wxCardSpendMapper; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxCUserMapper wxCUserMapper; |
|
|
|
|
|
|
|
@@ -421,28 +421,37 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { |
|
|
|
|
|
|
|
WxCouponOrder wxCouponOrder = new WxCouponOrder(); |
|
|
|
wxCouponOrder.setcUserId(param.getId()); |
|
|
|
wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); |
|
|
|
|
|
|
|
WxCardSpend wxCardSpend = new WxCardSpend(); |
|
|
|
wxCardSpend.setOwnerId(param.getId()); |
|
|
|
|
|
|
|
for (int ago = 0; ago > -30 ; ago-- ) { |
|
|
|
wxCouponOrder.setStartTime(startC.getTime()); |
|
|
|
wxCouponOrder.setEndTime(endC.getTime()); |
|
|
|
|
|
|
|
wxCardSpend.setStartdate(startC.getTime()); |
|
|
|
wxCardSpend.setEnddate(endC.getTime()); |
|
|
|
int cardSpendCount = wxCardSpendMapper.findCount(wxCardSpend); |
|
|
|
int verifiedCount = wxCouponOrderMapper.findCount(wxCouponOrder); |
|
|
|
if (endC.get(Calendar.DAY_OF_WEEK) != Calendar.SUNDAY |
|
|
|
&& endC.get(Calendar.DAY_OF_WEEK) != Calendar.SATURDAY) { |
|
|
|
workDayCount += verifiedCount; |
|
|
|
workDayCount += verifiedCount+cardSpendCount; |
|
|
|
} else { |
|
|
|
WeekendDayCount += verifiedCount; |
|
|
|
WeekendDayCount += verifiedCount+cardSpendCount; |
|
|
|
} |
|
|
|
|
|
|
|
endC.add(Calendar.DAY_OF_YEAR, -1); |
|
|
|
wxCouponOrder.setStartTime(endC.getTime()); |
|
|
|
wxCouponOrder.setEndTime(startC.getTime()); |
|
|
|
wxCardSpend.setStartdate(endC.getTime()); |
|
|
|
wxCardSpend.setEnddate(startC.getTime()); |
|
|
|
cardSpendCount = wxCardSpendMapper.findCount(wxCardSpend); |
|
|
|
verifiedCount = wxCouponOrderMapper.findCount(wxCouponOrder); |
|
|
|
if (endC.get(Calendar.DAY_OF_WEEK) != Calendar.SUNDAY |
|
|
|
&& endC.get(Calendar.DAY_OF_WEEK) != Calendar.SATURDAY) { |
|
|
|
workNightCount += verifiedCount; |
|
|
|
workNightCount += verifiedCount+cardSpendCount; |
|
|
|
} else { |
|
|
|
WeekendNightCount += verifiedCount; |
|
|
|
WeekendNightCount += verifiedCount+cardSpendCount; |
|
|
|
} |
|
|
|
|
|
|
|
startC.add(Calendar.DAY_OF_YEAR, -1); |
|
|
|
|