java/mx_charging_pile.git

			@@ -99,13 +99,9 @@
			@Override
			public TActivityVO activityStatistics(TActivityStatisticsQuery dto) {
			TActivityVO res = new TActivityVO();



			PageInfo<TActivityStatisticslVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
			PageInfo<TActivityStatisticslVO> pageInfo1 = new PageInfo<>(1,9999999);
			List<TActivityStatisticslVO> list = this.baseMapper.activityStatistics(pageInfo,dto);
			List<TActivityStatisticslVO> list1 = this.baseMapper.activityStatistics(pageInfo1,dto);
			List<TActivityStatisticslVO> list1 = this.baseMapper.activityStatisticsNolimit(dto);

			// 优惠券金额
			BigDecimal coupon = new BigDecimal("0");
			@@ -179,9 +175,9 @@
			tActivityStatisticslVO.setType("赠送会员");
			tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
			}else{
			// 赠送
			grantVip = grantVip.add(tActivityStatisticslVO.getVipDiscountAmount());
			tActivityStatisticslVO.setType("赠送会员");
			// 会员活动
			vipActivity = vipActivity.add(tActivityStatisticslVO.getVipDiscountAmount());
			tActivityStatisticslVO.setType("会员活动");
			tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
			}
			break;
			@@ -451,10 +447,16 @@
			amount.setTotal(shoppingOrder.getPaymentAmount().multiply(new BigDecimal(100)).intValue());
			amount.setCurrency("CNY");
			model.setAmount(amount);
			R<String> orderR = wxPaymentClient.refundOrderR(model);
			R<Map<String, Object>> orderR = wxPaymentClient.refundOrderR(model);
			if(200 == orderR.getCode()){
			this.updateById(shoppingOrder);
			shoppingOrderRefundService.save(shoppingOrderRefund);
			//手续费
			Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");
			Object refund_fee1 = amount1.get("refund_fee");
			BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));
			shoppingOrderRefund.setRefundFee(refund_fee);
			shoppingOrderRefundService.updateById(shoppingOrderRefund);
			}
			}
			if(2 == paymentType){
			@@ -644,10 +646,10 @@
			public List<SixShopDto> sixBefore(LocalDate sixBefore, Integer status) {
			return this.baseMapper.sixBefore(sixBefore,status);
			}


			@Override
			public BigDecimal getSumAmount(LocalDate sixBefore) {
			return this.baseMapper.getSumAmount(sixBefore);
			public BigDecimal getSumAmount() {
			return this.baseMapper.getSumAmount();
			}

			@Override