diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java index 964a6d072..17c475554 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java @@ -2,7 +2,6 @@ package com.jsowell.pile.dto; import com.jsowell.pile.domain.MemberPlateNumberRelation; import com.jsowell.pile.domain.PileAuthCard; -import com.jsowell.pile.vo.CarVinInfoVO; import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO; import com.jsowell.pile.vo.web.BillingTemplateVO; import lombok.Data; @@ -30,6 +29,7 @@ public class GenerateOrderDTO extends BasicPileDTO{ /** * 启动方式(0-后管启动;1-用户app启动) + * 0-后管启动;1-用户app启动;2-卡启动;3-离线卡启动; 4-联联平台启动; 5-车辆vin码启动 */ private String startMode; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 009d30656..4c596884b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1590,6 +1590,10 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { dto.setChargeAmount(totalAccountAmount); // 充电金额 dto.setPayMode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue()); // 1-余额支付 + + /* + 生成订单 + */ OrderBasicInfo basicInfo = generateOrder(dto); if (basicInfo == null) { return null; diff --git a/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java b/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java index cf4d8a23b..a8e559488 100644 --- a/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java +++ b/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java @@ -196,7 +196,7 @@ public class WxAppletRemoteService { return null; } AppletTemplateMessageSendDTO msgInfo = new AppletTemplateMessageSendDTO(); - msgInfo.setType("1"); // 1-开始充电推送消息 + msgInfo.setType(Constants.ONE); // 1-开始充电推送消息 msgInfo.setTouser(openId); // 通过orderCode查询到充电站点和开始时间并set String orderCode = dto.getOrderCode();