autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-22 20:15:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-01-06 15:13:50 +08:00
parent caf9eb21bf
commit d685d12723
35 changed files with 2352 additions and 784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
View File

@@ -44,7 +44,7 @@ public class TempController extends BaseController {
private TempService tempService;
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
@Autowired
private IMemberPlateNumberRelationService memberPlateNumberRelationService;

2
jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
View File

@@ -90,7 +90,7 @@ public class MemberService {
private PileRemoteService pileRemoteService;
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
@Autowired
private OrderService orderService;

6
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -66,7 +66,7 @@ public class OrderService {
private final Logger log = LoggerFactory.getLogger(this.getClass());
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
@Autowired
private PileRemoteService pileRemoteService;
@@ -365,8 +365,8 @@ public class OrderService {
order.setEndTime(DateUtils.formatDateTime(orderBasicInfo.getChargeEndTime()));
order.setCreateTime(DateUtils.formatDateTime(orderBasicInfo.getCreateTime()));
order.setStopReasonMsg(orderBasicInfo.getReason());
order.setStartSOC(orderBasicInfo.getStartSOC());
order.setEndSOC(orderBasicInfo.getEndSOC());
order.setStartSOC(orderBasicInfo.getStartSoc());
order.setEndSOC(orderBasicInfo.getEndSoc());
order.setSettleAmount(String.valueOf(orderBasicInfo.getSettleAmount()));
order.setSettlementTime(DateUtils.formatDateTime(orderBasicInfo.getSettlementTime()));
vo.setOrderInfo(order);

2
jsowell-admin/src/main/java/com/jsowell/service/PileService.java
View File

@@ -90,7 +90,7 @@ public class PileService {
private MemberService memberService;
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
@Autowired
private YKCPushCommandService ykcPushCommandService;

2
jsowell-admin/src/main/java/com/jsowell/service/TempService.java
View File

@@ -50,7 +50,7 @@ public class TempService {
private OrderBasicInfoMapper orderBasicInfoMapper;
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
@Autowired
private ClearingWithdrawInfoService clearingWithdrawInfoService;

8
jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java
View File

@@ -3,10 +3,10 @@ package com.jsowell.web.controller.index;
import com.alibaba.fastjson2.JSONObject;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.response.RestApiResponse;
import com.jsowell.pile.service.IOrderBasicInfoService;
import com.jsowell.pile.vo.web.IndexGeneralSituationVO;
import com.jsowell.pile.dto.IndexQueryDTO;
import com.jsowell.pile.service.IPileBasicInfoService;
import com.jsowell.pile.service.OrderBasicInfoService;
import com.jsowell.pile.vo.web.IndexGeneralSituationVO;
import com.jsowell.pile.vo.web.IndexOrderInfoVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -26,10 +26,10 @@ import java.util.List;
@RequestMapping("/index")
public class indexController extends BaseController {
@Autowired
IPileBasicInfoService pileBasicInfoService;
private IPileBasicInfoService pileBasicInfoService;
@Autowired
IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
@PostMapping("/getGeneralSituation")
public RestApiResponse<?> getGeneralSituation(@RequestBody IndexQueryDTO dto) {

4
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
View File

@@ -15,9 +15,9 @@ import com.jsowell.pile.dto.ApplyRefundDTO;
import com.jsowell.pile.dto.ManualSettlementDTO;
import com.jsowell.pile.dto.QueryMerchantOrderDTO;
import com.jsowell.pile.dto.QueryOrderDTO;
import com.jsowell.pile.service.IOrderBasicInfoService;
import com.jsowell.pile.service.IPileMerchantInfoService;
import com.jsowell.pile.service.IPileStationInfoService;
import com.jsowell.pile.service.OrderBasicInfoService;
import com.jsowell.pile.util.UserUtils;
import com.jsowell.pile.vo.web.OrderListVO;
import com.jsowell.service.OrderService;
@@ -39,7 +39,7 @@ import java.util.List;
@RequestMapping("/order")
public class OrderBasicInfoController extends BaseController {
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
@Autowired
private OrderService orderService;