update 查询会员余额明细添加字段

This commit is contained in:
Lemon
2023-07-24 15:32:19 +08:00
parent 992f945274
commit 649239e4bd
7 changed files with 166 additions and 31 deletions

View File

@@ -3,9 +3,13 @@ package com.jsowell.web.controller.pile;
import com.google.common.collect.ImmutableMap;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.domain.AjaxResult;
import com.jsowell.common.enums.ykc.OrderPayModeEnum;
import com.jsowell.common.enums.ykc.PayModeEnum;
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.id.IdUtils;
import com.jsowell.pile.dto.GenerateOrderDTO;
import com.jsowell.pile.dto.PayOrderDTO;
import com.jsowell.pile.dto.QueryPileDTO;
import com.jsowell.pile.dto.UpdateFirmwareDTO;
import com.jsowell.service.OrderService;
@@ -17,6 +21,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
/**
* 远程控制controller
*/
@@ -58,16 +64,27 @@ public class PileRemoteController {
*/
@PostMapping("/remoteStartChargingForWeb")
public AjaxResult remoteStartCharging(@RequestBody GenerateOrderDTO dto) {
// pileRemoteService.remoteStartCharging(queryPileDTO.getPileSn(), queryPileDTO.getConnectorCode());
// 生成订单并远程启动充电
dto.setStartMode(Constants.ZERO);
String orderCode = null;
// dto.setStartMode(Constants.ZERO);
// String orderCode = null;
String transactionCode = null;
try {
orderCode = orderService.generateOrder(dto);
transactionCode = IdUtils.generateTransactionCode(dto.getPileSn(), dto.getConnectorCode());
pileRemoteService.remoteStartCharging(dto.getPileSn(), dto.getConnectorCode(), transactionCode, new BigDecimal("500"));
// // 生成订单
// orderCode = orderService.generateOrder(dto);
// // 支付订单
// PayOrderDTO payOrderDTO = new PayOrderDTO();
// payOrderDTO.setPayMode(OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue());
// payOrderDTO.setOrderCode(orderCode);
// payOrderDTO.setStartMode(Constants.ZERO);
//
// orderService.payOrder(payOrderDTO);
} catch (Exception e) {
e.printStackTrace();
}
return AjaxResult.success(ImmutableMap.of("orderCode", orderCode));
return AjaxResult.success(ImmutableMap.of("orderCode", transactionCode));
}
/**