java/mx_charging_pile.git

			@@ -36,6 +36,10 @@
			@ApiModelProperty(value = "用户id")
			@TableField("app_user_id")
			private Long appUserId;

			@ApiModelProperty(value = "订单标题")
			@TableField("title")
			private String title;

			@ApiModelProperty(value = "停车场名称")
			@TableField("name")

			@@ -270,10 +270,10 @@
			@ApiOperation(value = "下载-已出账", tags = {"管理后台-充电算账单"})
			@PutMapping("/downloadBill")
			@Log(title = "【充电算账单】下载算账单", businessType = BusinessType.EXPORT)
			public R downloadBill(@RequestBody ExportUidDto uid, HttpServletResponse response)
			public R downloadBill(@RequestBody String uid, HttpServletResponse response)
			{
			ChargingListQuery chargingListQuery = new ChargingListQuery();
			chargingListQuery.setUid(uid.getUid());
			chargingListQuery.setUid(uid);
			chargingListQuery.setPageCurr(1);
			chargingListQuery.setPageSize(99999);
			ChargingBillVO data = chargingOrderClient.chargingBillListR(chargingListQuery).getData();
			@@ -371,8 +371,6 @@
			public R downloadSettlementTotal(@RequestBody ExportUidDto uid,HttpServletResponse response)
			{
			SettlementTotalVO data = chargingOrderClient.settlementTotalR(uid.getTime()).getData();


			try {
			response.setCharacterEncoding(Constants.UTF8);
			response.setContentType("application/vnd.ms-excel");

Binary files differ

			@@ -82,6 +82,7 @@
			BigDecimal payment = new BigDecimal(order.getPayment());
			parkingRecord.setStatus(BigDecimal.ZERO.compareTo(payment) == 0 ? 2 : 3);
			parkingRecord.setOutParkingType(BigDecimal.ZERO.compareTo(payment) == 0 ? 2 : 1);
			parkingRecord.setTitle("【停车缴费】" + payment + "元");
			parkingRecordClient.updateParkingRecord(parkingRecord);
			}

			@@ -134,6 +135,10 @@
			parkingRecord.setParkingDuration(Integer.valueOf(order.getLongTime()));
			parkingRecord.setOrderAmount(new BigDecimal(order.getMoney()));
			parkingRecord.setPayment(new BigDecimal(order.getMoney()));
			BigDecimal payment = new BigDecimal(order.getMoney());
			parkingRecord.setStatus(BigDecimal.ZERO.compareTo(payment) == 0 ? 2 : 3);
			parkingRecord.setOutParkingType(BigDecimal.ZERO.compareTo(payment) == 0 ? 2 : 1);
			parkingRecord.setTitle("【停车缴费】" + payment + "元");
			parkingRecordClient.updateParkingRecord(parkingRecord);
			}

	ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-chargingPile/src/main/resources/template/结算汇总.xlsx	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史