| | |
|---|
| | | List<TActivityStatisticslVO> list = this.baseMapper.activityStatistics(pageInfo,dto); |
|---|
| | | List<TActivityStatisticslVO> list1 = this.baseMapper.activityStatistics(pageInfo1,dto); |
|---|
| | | |
|---|
| | | list.sort((o1, o2) -> o2.getCreateTime().compareTo(o1.getCreateTime())); |
|---|
| | | // 优惠券金额 |
|---|
| | | BigDecimal coupon = new BigDecimal("0"); |
|---|
| | | // 会员抵扣金额 |
|---|
| | |
|---|
| | | break; |
|---|
| | | case 3: |
|---|
| | | // 会员订单 优惠金额大于0 |
|---|
| | | if (tActivityStatisticslVO.getVipDiscountAmount()!=null |
|---|
| | | && |
|---|
| | | (tActivityStatisticslVO.getCouponDiscountAmount().compareTo(BigDecimal.ZERO)>0)){ |
|---|
| | | if (tActivityStatisticslVO.getVipDiscountAmount()!=null){ |
|---|
| | | vipActivity = vipActivity.add(tActivityStatisticslVO.getVipDiscountAmount()); |
|---|
| | | } |
|---|
| | | tActivityStatisticslVO.setType("会员活动"); |
|---|
| | |
|---|
| | | // 充电订单 优惠券金额大于0 |
|---|
| | | if (tActivityStatisticslVO.getCouponDiscountAmount()!=null |
|---|
| | | && |
|---|
| | | (tActivityStatisticslVO.getCouponDiscountAmount().compareTo(BigDecimal.ZERO)>0)){ |
|---|
| | | stringBuilder.append("优惠券抵扣").append("+"); |
|---|
| | | } |
|---|
| | | (tActivityStatisticslVO.getCouponDiscountAmount().compareTo(BigDecimal.ZERO)>0)){ |
|---|
| | | stringBuilder.append("优惠券抵扣").append("+"); |
|---|
| | | } |
|---|
| | | if (tActivityStatisticslVO.getVipDiscountAmount()!=null &&(tActivityStatisticslVO.getVipDiscountAmount().compareTo(BigDecimal.ZERO)>0)){ |
|---|
| | | discount = discount.add(tActivityStatisticslVO.getVipDiscountAmount()); |
|---|
| | | stringBuilder.append("会员抵扣").append("+"); |
|---|
| | | } |
|---|
| | | if (stringBuilder.length()>0){ |
|---|
