ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ParkingLotClient.java
@@ -29,7 +29,7 @@ @PostMapping(value = "/t-parking-lot/getLotBySiteId") public R<TParkingLot> getLotBySiteId(@RequestParam("siteId") Integer siteId); @PostMapping(value = "/t-parking-lot/getRecordById") @GetMapping(value = "/t-parking-lot/getRecordById") public R<TParkingRecord> getRecordById(@RequestParam("id") Long siteId); @PostMapping(value = "/t-parking-lot/getRecordAmount") ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
@@ -31,7 +31,7 @@ R<String> queryOrderByGunId(@PathVariable("id") String id); @PostMapping(value = "/t-charging-order/useOrderCount") R<Long> useOrderCount(@RequestParam("userId") Long userId); @PostMapping(value = "/t-charging-order/chargingBillListR") @PostMapping(value = "/chargingBill/chargingBillListR") R<ChargingBillVO> chargingBillListR(@RequestBody ChargingListQuery dto); @PostMapping(value = "/t-charging-order/detail") R<TChargingOrder> orderDetail(@RequestParam("orderId") Long orderId); ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java
@@ -51,6 +51,9 @@ @ApiModelProperty(value = "签到得积分{\"num1\":1,\"num2\":[\"1(多少天),2（多少分）\"]}") @TableField("sign_in_for_points") private String signInForPoints; @ApiModelProperty(value = "是否双倍") @TableField(exist = false) private Integer isDouble; } ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -655,7 +655,8 @@ response.setContentType("application/vnd.ms-excel"); response.setHeader("Access-Control-Expose-Headers", "Content-disposition"); response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("月账单-"+data.getCategory()+data.getBillWeek()+data.getSiteName(), CharEncoding.UTF_8) + ".xlsx"); // URLEncoder.encode("月账单-"+data.getCategory()+data.getBillWeek()+data.getSiteName(), CharEncoding.UTF_8) + ".xlsx"); URLEncoder.encode("月账单", CharEncoding.UTF_8) + ".xlsx"); } catch (UnsupportedEncodingException e) { return R.fail("excel导出失败！"); } ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
@@ -37,6 +37,7 @@ import java.math.BigDecimal; import java.net.URLEncoder; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.HashMap; @@ -151,6 +152,7 @@ public R out(Long id) { TParkingRecord byId = parkingRecordService.getById(id); byId.setStatus(2); byId.setOutParkingTime(LocalDateTime.now()); parkingRecordService.updateById(byId); return R.ok();
@@ -286,15 +286,18 @@ } BigDecimal paymentAmount = new BigDecimal("0"); BigDecimal refundAmount = new BigDecimal("0"); BigDecimal commissionAmount = new BigDecimal("0"); List<TChargingOrder> tChargingOrders = chargingOrderService.list(eq); // 累加支付金额 BigDecimal bigDecimal = new BigDecimal("0"); BigDecimal bigDecimal1 = new BigDecimal("0.006"); int i =1; for (TChargingOrder tChargingOrder : tChargingOrders) { // 账单信息 paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()); paymentAmount = paymentAmount.add(tChargingOrder.getChargeAmount()); commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(bigDecimal1)); // 退款信息 ChargingBillRefundExport chargingBillRefundExport = new ChargingBillRefundExport(); ChargingBillPayExport chargingBillPayExport = new ChargingBillPayExport(); @@ -342,7 +345,7 @@ chargingBillPayExport.setTotal(""); chargingBillPayExports.add(chargingBillPayExport); i++; bigDecimal = bigDecimal.add(tChargingOrder.getOrderAmount()); bigDecimal = bigDecimal.add(tChargingOrder.getChargeAmount()); } if (!chargingBillPayExports.isEmpty()){ chargingBillPayExports.get(0).setTotal(bigDecimal+""); @@ -358,7 +361,7 @@ } chargingBillExport.setPaymentAmount(paymentAmount); chargingBillExport.setRefundAmount(refundAmount); chargingBillExport.setIncome(paymentAmount.subtract(refundAmount)); chargingBillExport.setIncome(paymentAmount.subtract(refundAmount).subtract(commissionAmount).setScale(2, BigDecimal.ROUND_DOWN)); chargingBillExports.add(chargingBillExport); // 导出 List<Map<String, Object>> sheetsList = new ArrayList<>(); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -19,6 +19,7 @@ import com.ruoyi.chargingPile.api.model.Site; import com.ruoyi.chargingPile.api.model.TChargingGun; import com.ruoyi.chargingPile.api.model.TChargingPile; import com.ruoyi.chargingPile.api.model.TParkingRecord; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.dto.ChargingOrderGroup; import com.ruoyi.common.core.dto.ChargingPercentProvinceDto; @@ -226,17 +227,15 @@ payOrderInfoDto2.setFinalAmount(byId2.getPaymentAmount().subtract(byId2.getRefundAmount())); return R.ok(payOrderInfoDto2); //todo luo 停车场订单 // case 4: // TParkingRecord byId3 = parkingLotClient.getRecordById(orderId).getData(); // PayOrderInfoDto payOrderInfoDto3 = new PayOrderInfoDto(); // payOrderInfoDto3.setOrderId(byId3.getId().toString()); // payOrderInfoDto3.setCode(byId3.getCode()); // payOrderInfoDto3.setTradeNo(byId3); // payOrderInfoDto3.setPayType(0); // payOrderInfoDto3.setPayAmount(new BigDecimal("0")); // payOrderInfoDto3.setPayTime(LocalDateTime.now()); // payOrderInfoDto3.setRefundAmount(new BigDecimal("0")); case 4: R<TParkingRecord> recordById = parkingLotClient.getRecordById(orderId); TParkingRecord byId3 =recordById.getData(); PayOrderInfoDto payOrderInfoDto3 = new PayOrderInfoDto(); payOrderInfoDto3.setOrderId(byId3.getId().toString()); payOrderInfoDto3.setCode(byId3.getCode()); payOrderInfoDto3.setPayTime(byId3.getCreateTime()); payOrderInfoDto3.setRechargeAmount(byId3.getPayment()); return R.ok(payOrderInfoDto3);
@@ -5,15 +5,22 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.account.api.feignClient.AppUserCarClient; import com.ruoyi.account.api.feignClient.AppUserClient; import com.ruoyi.account.api.model.TAppUser; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.other.api.domain.THtml; import com.ruoyi.other.api.domain.TIntegralRule; import com.ruoyi.other.api.domain.TVip; import com.ruoyi.other.api.dto.SaveHtml; import com.ruoyi.other.service.THtmlService; import com.ruoyi.other.service.TIntegralRuleService; import com.ruoyi.other.service.TVipService; import com.ruoyi.system.api.model.LoginUserApplet; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -35,6 +42,8 @@ private THtmlService htmlService; @Autowired private TIntegralRuleService integralRuleService; @Autowired private AppUserClient appUserClient; /** @@ -54,12 +63,34 @@ point += jsonObject.getInteger("num4"); return R.ok(point); } @Autowired private TokenService tokenService; @Autowired private TVipService vipService; @GetMapping("/getSet") @ApiOperation(tags = {"管理后台-积分管理","小程序-个人中心-签到"},value = "获取积分设置") public R<TIntegralRule> getSet() { TIntegralRule res = integralRuleService.getOne(new QueryWrapper<>()); return R.ok(res); } @GetMapping("/getSet1") @ApiOperation(tags = {"小程序-个人中心-签到"},value = "获取积分设置") public R<TIntegralRule> getSet1() { TIntegralRule res = integralRuleService.getOne(new QueryWrapper<>()); LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet(); res.setIsDouble(0); if (loginUserApplet!=null){ TAppUser data = appUserClient.getUserById(loginUserApplet.getUserId()).getData(); if (data.getVipEndTime()!=null && data.getVipEndTime().isAfter(LocalDateTime.now())){ TVip byId = vipService.getById(data.getVipId()); Integer doubleIntegration = byId.getDoubleIntegration(); if (doubleIntegration!=null&&doubleIntegration==1){ res.setIsDouble(1); } } } return R.ok(res); } @PostMapping("/saveSet") @ApiOperation(tags = {"管理后台-积分管理"},value = "保存积分设置")
