java/mx_charging_pile.git

			@@ -367,9 +367,9 @@
			@ApiOperation(value = "下载", tags = {"管理后台-结算表记录"})
			@PutMapping("/downloadSettlement")
			@Log(title = "【结算表记录】下载结算表", businessType = BusinessType.EXPORT)
			public R downloadSettlement(@RequestBody ExportUidDto uid,HttpServletResponse response)
			public R downloadSettlement(String uid,HttpServletResponse response)
			{
			TSettlementConfirm data = chargingOrderClient.downloadSettlement(uid.getUid()).getData();
			TSettlementConfirm data = chargingOrderClient.downloadSettlement(uid).getData();
			List<Site> data1 = siteClient.getSiteByIds(Arrays.asList(data.getSiteId())).getData();
			if (!data1.isEmpty()){
			data.setSiteName(data1.get(0).getName());

			@@ -82,8 +82,7 @@
			}
			@ApiOperation(value = "充电时段统计-导出", tags = {"管理后台-财务结算"})
			@PutMapping("/export")
			public void export(@RequestBody ChargingListQuery dto)
			{
			public void export(@RequestBody ChargingListQuery dto) {
			ChargingOrderTimeVO res = chargingOrderService.chargingList(dto);
			List<TChargingOrderExport> tChargingOrderExports = new ArrayList<>();
			List<ChargingOrderListVO> exportList = res.getExportList();

			@@ -221,6 +221,8 @@
			//生成积分兑换成功的订单
			R<Long> longR = orderClient.exchangeCreate(exchangeDto);
			if (exchangeDto.getGoodType()==2) {
			TCoupon coupon = couponService.getById(exchangeDto.getGoodId());

			//如果是优惠卷，赠送优惠卷给用户
			GrantCouponDto grantCouponDto = new GrantCouponDto();
			grantCouponDto.setUserIds(userId.toString());
			@@ -228,6 +230,14 @@
			grantCouponDto.setWaysToObtain(1);
			grantCouponDto.setEndTime(LocalDateTime.now());
			grantCouponDto.setType(3);
			switch (coupon.getValidityPeriodMode()){
			case 1:
			grantCouponDto.setEndTime(coupon.getEndTime());
			break;
			case 2:
			grantCouponDto.setEndTime(LocalDateTime.now().plusDays(coupon.getDays()));
			break;
			}
			appCouponClient.grantCoupon(grantCouponDto);
			}
			//生成消耗积分的记录

	ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史