autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-17 16:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2023-07-08 11:33:52 +08:00
parent 0df763b191 fceaeb4ba5
commit 22e96cc22a
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java
View File

@@ -2,7 +2,6 @@ package com.jsowell.pile.dto;
import com.jsowell.pile.domain.MemberPlateNumberRelation; import com.jsowell.pile.domain.MemberPlateNumberRelation;
import com.jsowell.pile.domain.PileAuthCard; import com.jsowell.pile.domain.PileAuthCard;
import com.jsowell.pile.vo.CarVinInfoVO;
import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO; import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO;
import com.jsowell.pile.vo.web.BillingTemplateVO; import com.jsowell.pile.vo.web.BillingTemplateVO;
import lombok.Data; import lombok.Data;
@@ -30,6 +29,7 @@ public class GenerateOrderDTO extends BasicPileDTO{
/** /**
* 启动方式（0-后管启动；1-用户app启动） * 启动方式（0-后管启动；1-用户app启动）
* 0-后管启动；1-用户app启动；2-卡启动；3-离线卡启动; 4-联联平台启动; 5-车辆vin码启动
*/ */
private String startMode; private String startMode;

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1590,6 +1590,10 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
dto.setChargeAmount(totalAccountAmount); // 充电金额 dto.setChargeAmount(totalAccountAmount); // 充电金额
dto.setPayMode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue()); // 1-余额支付 dto.setPayMode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue()); // 1-余额支付
/*
生成订单
*/
OrderBasicInfo basicInfo = generateOrder(dto); OrderBasicInfo basicInfo = generateOrder(dto);
if (basicInfo == null) { if (basicInfo == null) {
return null; return null;

2
jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java
View File

@@ -196,7 +196,7 @@ public class WxAppletRemoteService {
return null; return null;
} }
AppletTemplateMessageSendDTO msgInfo = new AppletTemplateMessageSendDTO(); AppletTemplateMessageSendDTO msgInfo = new AppletTemplateMessageSendDTO();
msgInfo.setType("1"); // 1-开始充电推送消息 msgInfo.setType(Constants.ONE); // 1-开始充电推送消息
msgInfo.setTouser(openId); msgInfo.setTouser(openId);
// 通过orderCode查询到充电站点和开始时间并set // 通过orderCode查询到充电站点和开始时间并set
String orderCode = dto.getOrderCode(); String orderCode = dto.getOrderCode();