mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-21 11:35:12 +08:00
update 卡启动、vin启动逻辑修改
This commit is contained in:
@@ -19,9 +19,7 @@ import com.jsowell.common.core.domain.entity.SysDictData;
|
||||
import com.jsowell.common.core.domain.ykc.LoginRequestData;
|
||||
import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
|
||||
import com.jsowell.common.core.redis.RedisCache;
|
||||
import com.jsowell.common.enums.ykc.OrderStatusEnum;
|
||||
import com.jsowell.common.enums.ykc.StartModeEnum;
|
||||
import com.jsowell.common.enums.ykc.YKCChargingStopReasonEnum;
|
||||
import com.jsowell.common.enums.ykc.*;
|
||||
import com.jsowell.common.exception.BusinessException;
|
||||
import com.jsowell.common.util.*;
|
||||
import com.jsowell.common.util.Cp56Time2a.Cp56Time2aUtil;
|
||||
@@ -42,6 +40,7 @@ import com.jsowell.pile.mapper.MemberBasicInfoMapper;
|
||||
import com.jsowell.pile.mapper.PileBillingTemplateMapper;
|
||||
import com.jsowell.pile.service.*;
|
||||
import com.jsowell.pile.vo.base.PileInfoVO;
|
||||
import com.jsowell.pile.vo.uniapp.MemberVO;
|
||||
import com.jsowell.pile.vo.web.BillingTemplateVO;
|
||||
import com.jsowell.pile.vo.web.OrderListVO;
|
||||
import com.jsowell.pile.vo.web.PileDetailVO;
|
||||
@@ -177,6 +176,48 @@ public class SpringBootTestController {
|
||||
@Autowired
|
||||
private TransactionRecordsRequestHandler transactionRecordsRequestHandler;
|
||||
|
||||
@Autowired
|
||||
private IMemberBasicInfoService memberBasicInfoService;
|
||||
|
||||
@Test
|
||||
public void testOrder() throws Exception {
|
||||
// 通过vin码查询数据库绑定用户信息
|
||||
MemberPlateNumberRelation plateInfo = memberPlateNumberRelationService.getMemberPlateInfoByVinCode("LNBSCC4H1LT107646");
|
||||
GenerateOrderDTO dto = new GenerateOrderDTO();
|
||||
dto.setMemberPlateNumberRelation(plateInfo);
|
||||
dto.setPileSn("88000000000126");
|
||||
dto.setConnectorCode("01");
|
||||
dto.setStartMode(StartModeEnum.VIN_CODE.getValue());
|
||||
dto.setMemberId(plateInfo.getMemberId());
|
||||
// 通过memberId获取账户余额
|
||||
MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(dto.getMemberId());
|
||||
if (memberVO == null) {
|
||||
throw new BusinessException(ReturnCodeEnum.CODE_GET_MEMBER_ACCOUNT_AMOUNT_ERROR);
|
||||
}
|
||||
BigDecimal totalAccountAmount = memberVO.getTotalAccountAmount();
|
||||
if (totalAccountAmount.compareTo(BigDecimal.ZERO) <= 0) {
|
||||
throw new BusinessException(ReturnCodeEnum.CODE_BALANCE_IS_INSUFFICIENT);
|
||||
}
|
||||
|
||||
dto.setChargeAmount(totalAccountAmount); // 充电金额
|
||||
dto.setPayMode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue()); // 1-余额支付
|
||||
|
||||
OrderBasicInfo basicInfo = orderBasicInfoService.generateOrder(dto);
|
||||
|
||||
// 支付订单
|
||||
PayOrderDTO payOrderDTO = new PayOrderDTO();
|
||||
payOrderDTO.setOrderCode(basicInfo.getOrderCode());
|
||||
payOrderDTO.setPayAmount(totalAccountAmount);
|
||||
payOrderDTO.setPayMode(dto.getPayMode());
|
||||
payOrderDTO.setMemberId(dto.getMemberId());
|
||||
// payOrderDTO.setCode();
|
||||
// payOrderDTO.setLockValue();
|
||||
payOrderDTO.setOrderBasicInfo(basicInfo);
|
||||
|
||||
Map<String, Object> map = orderBasicInfoService.payOrder(payOrderDTO);
|
||||
|
||||
System.out.println(map);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testTransactionRecord() {
|
||||
@@ -423,7 +464,7 @@ public class SpringBootTestController {
|
||||
// redis锁
|
||||
Boolean isLock = redisCache.lock(lockKey, uuid, 1500);
|
||||
if (isLock) {
|
||||
transactionRecordsRequestHandler.processOrder(data);
|
||||
// transactionRecordsRequestHandler.processOrder(data);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
System.out.println("处理订单发生异常: " + e);
|
||||
|
||||
Reference in New Issue
Block a user