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

Merge branch 'dev' into dev-g

Browse Source
This commit is contained in:
Guoqs
2025-06-26 15:50:09 +08:00
parent b4ab1ffc8c c0240fdf23
commit 977f2e3eff
22 changed files with 794 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java
View File

@@ -6,6 +6,7 @@ import com.jsowell.adapay.dto.*;
import com.jsowell.adapay.service.AdapayService;
import com.jsowell.adapay.vo.AdapayAccountBalanceVO;
import com.jsowell.common.annotation.Log;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.domain.AjaxResult;
import com.jsowell.common.core.page.PageResponse;
@@ -15,10 +16,7 @@ import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.service.ClearingWithdrawInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
@@ -201,4 +199,42 @@ public class AdapayMemberController extends BaseController {
}
return result;
}
/**
* 删除结算账户
* @param dto
* @return
*/
@PostMapping("/deleteSettleAccount")
public AjaxResult deleteSettleAccount(@RequestBody AdapayMemberInfoDTO dto) {
AjaxResult result = null;
try {
// 新写删除方法
adapayService.deleteSettleAccount(dto);
result = AjaxResult.success();
} catch (Exception e) {
logger.error("删除结算账户 error,", e);
result = AjaxResult.error();
}
return result;
}
/**
* 在仅删除结算账户后，重新创建新的结算账户
* 注：使用原 member_id 重新创建结算账户对象，且必须与原身份证和银行卡户名保持一致
* @param dto
* @return
*/
@PostMapping("createBankAccount")
public AjaxResult createBankAccount(@RequestBody SettleAccountDTO dto) {
AjaxResult result = null;
try {
adapayService.createBankAccount(dto);
} catch (Exception e) {
logger.error("重新创建结算账户 error, ", e);
result = AjaxResult.error();
}
return result;
}
}

9
jsowell-admin/src/test/java/PaymentTestController.java
View File

@@ -211,15 +211,16 @@ public class PaymentTestController {
/**
* 提现方法
*
*/
@Test
public void withdraw() {
String merchantId = "349";
String merchantId = "87";
String orderNo = "drawcash_" + merchantId + "_" + System.currentTimeMillis();
BigDecimal cashAmt = new BigDecimal("560.17");
String adapayMemberId = "ACM88073310";
BigDecimal cashAmt = new BigDecimal("2013.81");
String adapayMemberId = "AM67987250";
// String adapayAppId = "app_d0c80cb1-ffc8-48cb-a030-fe9bec823aaa"; // 固定参数, 汇付配置的万车充小程序appId
String settleAccountId = "0744607938214272";
String settleAccountId = "0600303988488384";
String wechatAppId = wechatAppId1;
try {
adapayService.createDrawcashRequest(orderNo, cashAmt, adapayMemberId, adapayAppId, settleAccountId, wechatAppId);

10
jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/YKCFrameTypeCode.java
View File

@@ -104,6 +104,12 @@ public enum YKCFrameTypeCode {
UPLOAD_PILE_FAULT_RECORD_CODE(0xDB, "上传桩端故障记录"),
PILE_APPLY_MERGE_CHARGE_CODE(0xA1, "充电桩主动申请并充充电"),
CONFIRM_MERGE_CHARGE_CODE(0xA2, "运营平台确认并充启动充电"),
PLATFORM_START_MERGE_CHARGE_CODE(0xA4, "运营平台远程控制并充启机"),
ANSWER_PLATFORM_START_MERGE_CODE(0xA3, "远程并充启机命令回复"),
// 自定义FrameType
PILE_LOG_OUT(9999, "充电桩退出"),
@@ -160,6 +166,8 @@ public enum YKCFrameTypeCode {
// 充电桩请求开始充电
START_CHARGING(REQUEST_START_CHARGING_CODE.getCode(), CONFIRM_START_CHARGING_CODE.getCode()),
START_MERGE_CHARGE(PILE_APPLY_MERGE_CHARGE_CODE.getCode(), CONFIRM_MERGE_CHARGE_CODE.getCode()),
// 交易记录
TRANSACTION_RECORDS(TRANSACTION_RECORDS_CODE.getCode(), TRANSACTION_RECORDS_CONFIRM_CODE.getCode()),
TRANSACTION_RECORDS_V13(TRANSACTION_RECORDS_OLD_VERSION_CODE.getCode(), TRANSACTION_RECORDS_CONFIRM_CODE.getCode()),
@@ -263,6 +271,8 @@ public enum YKCFrameTypeCode {
// 下发二维码
REMOTE_ISSUE_QRCODE(REMOTE_ISSUE_QRCODE_CODE.getCode(), REMOTE_ISSUE_QRCODE_ANSWER_CODE.getCode()),
START_MERGE_CHARGE_CODE(PLATFORM_START_MERGE_CHARGE_CODE.getCode(), ANSWER_PLATFORM_START_MERGE_CODE.getCode()),
// 查询工作参数
QUERY_PILE_WORK_PARAMS(QUERY_PILE_WORK_PARAMS_CODE.getCode(), QUERY_PILE_WORK_PARAMS_ANSWER_CODE.getCode()),

37
jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderTypeEnum.java Normal file
View File

@@ -0,0 +1,37 @@
package com.jsowell.common.enums.ykc;
/**
* 订单类型enum
*
* @author Lemon
* @Date 2025/6/16 13:59:20
*/
public enum OrderTypeEnum {
NORMAL_ORDER("1", "普通订单"),
MERGE_CHARGE_ORDER("2", "并充订单"),
;
private String value;
private String lable;
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
public String getLable() {
return lable;
}
public void setLable(String lable) {
this.lable = lable;
}
OrderTypeEnum(String value, String lable) {
this.value = value;
this.lable = lable;
}
}

2
jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java
View File

@@ -226,6 +226,8 @@ public enum ReturnCodeEnum {
CODE_SELECT_INFO_IS_NULL("00700001", "查询信息为空！"),
CODE_THIS_VIN_HAS_BEEN_BINDING("00700002", "该vin已被绑定，请检查!"),
CODE_THIS_VIN_INFO_IS_NULL("007000003", "未查到该vin信息！"),
;
private String value;

110
jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AnswerPlatformStartMergeChargeHandler.java Normal file
View File

@@ -0,0 +1,110 @@
package com.jsowell.netty.handler.yunkuaichong;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;
import com.jsowell.common.enums.ykc.ChargingFailedReasonEnum;
import com.jsowell.common.util.BytesUtil;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.YKCUtils;
import com.jsowell.netty.factory.YKCOperateFactory;
import com.jsowell.pile.service.OrderBasicInfoService;
import io.netty.channel.ChannelHandlerContext;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* 0xA3 远程并充启机命令回复
*
* @author Lemon
* @Date 2025/6/19 15:40:15
*/
@Slf4j
@Component
public class AnswerPlatformStartMergeChargeHandler extends AbstractYkcHandler {
private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.ANSWER_PLATFORM_START_MERGE_CODE.getBytes());
@Autowired
private OrderBasicInfoService orderBasicInfoService;
@Override
public void afterPropertiesSet() throws Exception {
YKCOperateFactory.register(type, this);
}
@Override
public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) {
// 获取消息体
byte[] msgBody = ykcDataProtocol.getMsgBody();
int startIndex = 0;
int length = 16;
// 交易流水号
byte[] transactionCodeByte = BytesUtil.copyBytes(msgBody, startIndex, length);
String transactionCode = BytesUtil.bcd2Str(transactionCodeByte);
// 桩编码
startIndex += length;
length = 7;
byte[] pileSnByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String pileSn = BytesUtil.bcd2Str(pileSnByteArr);
// 保存时间
saveLastTimeAndCheckChannel(pileSn, channel);
// 枪号
startIndex += length;
length = 1;
byte[] connectorCodeByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String connectorCode = BytesUtil.bcd2Str(connectorCodeByteArr);
// 启动结果 0x00失败 0x01成功
startIndex += length;
byte[] startResultByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String startResult = BytesUtil.bcd2Str(startResultByteArr);
/**
* 失败原因
*
* 桩在收到启充命令后,检测到未插枪则发送 0x33 报文回复充电失败。
* 若在 60 秒（以收到 0x34 时间开始计算）内检测到枪重新连接，则补送 0x33 成功报文;超时或者离线等其他异常，桩不启充、不补发 0x33 报文
* 0x00 无
* 0x01 设备编号不匹配
* 0x02 枪已在充电
* 0x03 设备故障
* 0x04 设备离线
* 0x05 未插枪
*/
startIndex += length;
byte[] failedReasonByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String failedReason = BytesUtil.bin2HexStr(failedReasonByteArr);
String failedReasonMsg = ChargingFailedReasonEnum.getMsgByCode(Integer.parseInt(failedReason, 16));
// 主辅枪标记
// 0x00 主枪
// 0x01 辅枪
startIndex += length;
length = 1;
byte[] connectorMarkByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String connectorMark = BytesUtil.bcd2Str(connectorMarkByteArr);
// 并充序号
// 由桩生成：年月日时分秒，多个枪并充时上送并充序号一致，表示为同一次并充操作
startIndex += length;
length = 6;
byte[] mergeChargeNumberByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String mergeChargeNumber = BytesUtil.bcd2Str(mergeChargeNumberByteArr);
if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)) {
// 启动失败 2025年4月2日16点39分修改逻辑:启动失败后不退款, 使用支付完成未启动定时任务退款
// orderBasicInfoService.chargingPileFailedToStart(transactionCode, failedReasonMsg);
} else {
// 启动成功
orderBasicInfoService.chargingPileStartedSuccessfully(transactionCode);
}
return null;
}
}

153
jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileApplyMergeChargeHandler.java Normal file
View File

@@ -0,0 +1,153 @@
package com.jsowell.netty.handler.yunkuaichong;
import com.google.common.primitives.Bytes;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;
import com.jsowell.common.util.BytesUtil;
import com.jsowell.common.util.YKCUtils;
import com.jsowell.netty.factory.YKCOperateFactory;
import com.jsowell.pile.dto.VerifyMergeChargeOrderDTO;
import com.jsowell.pile.service.OrderBasicInfoService;
import io.netty.channel.ChannelHandlerContext;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 0xA1 充电桩主动申请并充充电
*
* @author Lemon
* @Date 2025/6/12 11:37:36
*/
@Slf4j
@Component
public class PileApplyMergeChargeHandler extends AbstractYkcHandler{
private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.PILE_APPLY_MERGE_CHARGE_CODE.getBytes());
@Autowired
private OrderBasicInfoService orderBasicInfoService;
@Override
public void afterPropertiesSet() throws Exception {
YKCOperateFactory.register(type, this);
}
@Override
public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) {
// 获取消息体
byte[] msgBody = ykcDataProtocol.getMsgBody();
int startIndex = 0;
int length = 7;
// 桩编号
byte[] pileSnByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String pileSn = BytesUtil.binary(pileSnByteArr, 16);
// 保存时间
saveLastTimeAndCheckChannel(pileSn, channel);
// 枪号
startIndex += length;
length = 1;
byte[] connectorNumByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String connectorCode = BytesUtil.bcd2Str(connectorNumByteArr);
// 启动方式
// 0x01 表示通过刷卡启动充电
// 0x02 表求通过帐号启动充电 （暂不支持）
// 0x03 表示vin码启动充电
startIndex += length;
byte[] startModeByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String startMode = BytesUtil.bcd2Str(startModeByteArr);
// 是否需要密码 0x00 不需要 0x01 需要
startIndex += length;
byte[] needPasswordFlagByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String needPasswordFlag = BytesUtil.bcd2Str(needPasswordFlagByteArr);
// 物理卡号 不足 8 位补 0
startIndex += length;
length = 8;
byte[] cardNumByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String physicsCard = BytesUtil.binary(cardNumByteArr, 16);
// 输入密码 对用户输入的密码进行16 位MD5 加密，采用小写上传
startIndex += length;
length = 16;
byte[] inputPasswordByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String inputPasswordHexStr = BytesUtil.bin2HexStr(inputPasswordByteArr);
// VIN码
startIndex += length;
length = 17;
byte[] vinCodeByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String vinCode = BytesUtil.ascii2StrLittle(vinCodeByteArr);
// 主辅枪标记
// 0x00 主枪
// 0x01 辅枪
startIndex += length;
length = 1;
byte[] connectorMarkByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String connectorMark = BytesUtil.bcd2Str(connectorMarkByteArr);
// 并充序号
// 由桩生成：年月日时分秒，多个枪并充时上送并充序号一致，表示为同一次并充操作
startIndex += length;
length = 6;
byte[] mergeChargeNumberByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String mergeChargeNumber = BytesUtil.bcd2Str(mergeChargeNumberByteArr);
// 鉴权方法(返回交易流水号、账户余额、鉴权成功标识)
String pileConnectorCode = pileSn + connectorCode;
VerifyMergeChargeOrderDTO dto = VerifyMergeChargeOrderDTO.builder()
.pileSn(pileSn)
.connectorCode(connectorCode)
.pileConnectorCode(pileConnectorCode)
.startMode(startMode)
.physicsCard(physicsCard)
.vinCode(vinCode)
.connectorMark(connectorMark)
.mergeChargeNumber(mergeChargeNumber)
.build();
Map<String, Object> map = new LinkedHashMap<>();
String transactionCode = Constants.ILLEGAL_TRANSACTION_CODE;
byte[] authenticationFlagByteArr = Constants.zeroByteArray; // 鉴权成功标识
byte[] accountBalanceByteArr = Constants.zeroByteArray; // 账户余额
try {
map = orderBasicInfoService.verifyMergeChargeOrder(dto);
log.info("桩号:{}, 并充订单鉴权成功, 结果map:{}", pileSn, map);
} catch (Exception e) {
log.error("桩号:{}, 并充订单鉴权失败, ", pileSn, e);
}
if (map != null) {
transactionCode = (String) map.get("transactionCode");
accountBalanceByteArr = YKCUtils.getPriceByte(String.valueOf(map.get("accountBalance")), 2);
authenticationFlagByteArr = Constants.oneByteArray;
}
// 应答
// 交易流水号
// 桩编号
// 枪号
// 逻辑卡号
// 账户余额
// 鉴权成功标志
// 失败原因
// 并充序号
byte[] defeatReasonByteArr = Constants.zeroByteArray; // 失败原因
byte[] msgBodyByteArr = Bytes.concat(BytesUtil.str2Bcd(transactionCode), pileSnByteArr, connectorNumByteArr, cardNumByteArr,
accountBalanceByteArr, authenticationFlagByteArr, defeatReasonByteArr, mergeChargeNumberByteArr);
return getResult(ykcDataProtocol, msgBodyByteArr);
}
}

3
jsowell-pile/src/main/java/com/jsowell/adapay/dto/AdapayMemberInfoDTO.java
View File

@@ -21,6 +21,9 @@ public class AdapayMemberInfoDTO {
private String adapayMemberId;
// 结算账户id
private String settleAccountId;
//////////下面是创建结算账户参数///////////
// 银行卡号
private String cardId;

49
jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java
View File

@@ -1517,4 +1517,53 @@ public class AdapayService {
return totalSplitAmount;
}
/**
* 创建结算账户
* @param dto
* @throws BaseAdaPayException
*/
public void createBankAccount(SettleAccountDTO dto) throws BaseAdaPayException {
// 根据运营商id 查出现有的adapayMemberId
String merchantId = dto.getMerchantId();
// 新写一个查询方法，查询最近一条的记录（因为之前已经删除过数据，使用原查询方法查不到数据）
AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectRecentInfoByMerchantId(merchantId);
if (adapayMemberAccount == null) {
return;
}
String adapayMemberId = adapayMemberAccount.getAdapayMemberId();
// 查询该商户的wxAppId
String wxAppId = pileMerchantInfoService.queryAppIdByMerchantId(merchantId);
// 创建结算账户请求
Map<String, Object> settleAccount = this.createSettleAccountRequest(dto, adapayMemberId, wxAppId);
// 保存结果
if (settleAccount == null || StringUtils.equals((String) settleAccount.get("status"), "failed")) {
String errorMsg = settleAccount == null ? "创建汇付结算账户失败" : (String) settleAccount.get("error_msg");
throw new BusinessException("00500001", errorMsg);
}
String settleAccountId = (String) settleAccount.get("id");
// 保存到数据库
adapayMemberAccount = new AdapayMemberAccount();
adapayMemberAccount.setMerchantId(dto.getMerchantId());
adapayMemberAccount.setAdapayMemberId(adapayMemberId);
adapayMemberAccount.setSettleAccountId(settleAccountId);
adapayMemberAccount.setStatus(Constants.ONE);
adapayMemberAccountService.insertAdapayMemberAccount(adapayMemberAccount);
}
/**
* 删除结算账户（先删除汇付的结算账户，再逻辑删除数据库）
* @param dto
* @throws BaseAdaPayException
*/
public void deleteSettleAccount(AdapayMemberInfoDTO dto) throws BaseAdaPayException {
// 查询appId
String wechatAppId = pileMerchantInfoService.queryAppIdByMerchantId(dto.getMerchantId());
// 1、新建删除请求 2、如果成功，再将数据库中的记录删除
this.createDeleteSettleAccountRequest(dto.getAdapayMemberId(), dto.getSettleAccountId(), wechatAppId);
// 删除数据库中的记录
adapayMemberAccountService.deleteAccountByMerchantId(dto.getMerchantId());
}
}

15
jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java
View File

@@ -35,6 +35,21 @@ public class OrderBasicInfo {
*/
private String orderStatus;
/**
* 订单类型（1-普通订单；2-并充订单）
*/
private String orderType;
/**
* 并充订单序号
*/
private String mergeChargeNumber;
/**
* 主枪枪编号
*/
private String mainConnectorCode;
/**
* 会员id
*/

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

@@ -88,6 +88,26 @@ public class GenerateOrderDTO extends BasicPileDTO{
*/
private MemberPlateNumberRelation MemberPlateNumberRelation;
/**
* 鉴权成功标识
*/
private boolean verifyFlag;
/**
* 订单类型（1-普通订单；2-并充订单）
*/
private String orderType;
/**
* 并充序号（并充启动时有值）
*/
private String mergeChargeNumber;
/**
* 主枪枪编码（并充启动时有值）
*/
private String mainConnectorCode;
/**
* 车牌号码
*/

47
jsowell-pile/src/main/java/com/jsowell/pile/dto/VerifyMergeChargeOrderDTO.java Normal file
View File

@@ -0,0 +1,47 @@
package com.jsowell.pile.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 鉴权并充订单DTO
*
* @author Lemon
* @Date 2025/6/12 14:32:38
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class VerifyMergeChargeOrderDTO {
// 桩编号
private String pileSn;
// 枪号
private String connectorCode;
// 枪口编号
private String pileConnectorCode;
// 启动方式
// 0x01 表示通过刷卡启动充电
// 0x03 表示vin码启动充电
private String startMode;
// 物理卡号
private String physicsCard;
// vin
private String vinCode;
// 主辅枪标记
// 0x00 主枪
// 0x01 辅枪
private String connectorMark;
// 并充序号
// 由桩生成：年月日时分秒，多个枪并充时上送并充序号一致，表示为同一次并充操作
private String mergeChargeNumber;
}

13
jsowell-pile/src/main/java/com/jsowell/pile/mapper/AdapayMemberAccountMapper.java
View File

@@ -119,4 +119,17 @@ public interface AdapayMemberAccountMapper {
void updateAdapayMemberAccountByMemberId(AdapayMemberAccount adapayMemberAccount);
AdapayMemberAccount selectByMemberId(String memberId);
/**
* 通过运营商id删除账户信息
* @param merchantId
*/
void deleteAccountByMerchantId(String merchantId);
/**
* 根据运营商id查询最近一条的信息
* @param merchantId
* @return
*/
AdapayMemberAccount selectRecentInfoByMerchantId(String merchantId);
}

13
jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberAccountService.java
View File

@@ -109,4 +109,17 @@ public interface AdapayMemberAccountService {
* @return
*/
String selectMerchantNameByAdapayMemberId(String adapayMemberId);
/**
* 根据运营商id删除记录
* @param merchantId
*/
void deleteAccountByMerchantId(String merchantId);
/**
* 根据运营商Id查询最近一条的信息
* @param merchantId
* @return
*/
AdapayMemberAccount selectRecentInfoByMerchantId(String merchantId);
}

7
jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
View File

@@ -566,4 +566,11 @@ public interface OrderBasicInfoService{
* @param dto
*/
void setOrderSupplementAmount(OrderSupplementAmountDTO dto);
/**
* 鉴权并充订单
* @param dto
* @return
*/
Map<String, Object> verifyMergeChargeOrder(VerifyMergeChargeOrderDTO dto) throws Exception;
}

76
jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java
View File

@@ -278,44 +278,44 @@ public class PileRemoteService {
* @param dto
* @return
*/
public boolean publishBillingTemplateOld(PublishBillingTemplateDTO dto) {
// 获取计费模板信息
BillingTemplateVO billingTemplateVO = pileBillingTemplateService.selectBillingTemplateByTemplateId(dto.getTemplateId());
if (billingTemplateVO == null) {
log.warn("获取计费模板信息, 通过模板id:{}查询计费模板为null", dto.getTemplateId());
return false;
}
// 会员优惠计费模板不发布
if (Constants.ONE.equals(billingTemplateVO.getMemberFlag())) {
return false;
}
// 电单车计费模板不发布
if (Constants.TWO.equals(billingTemplateVO.getDeviceType())) {
return false;
}
// 更新计费模板的发布时间
PileBillingTemplate pileBillingTemplate = new PileBillingTemplate();
pileBillingTemplate.setId(Long.valueOf(billingTemplateVO.getTemplateId()));
pileBillingTemplate.setPublishTime(new Date());
pileBillingTemplateService.updatePileBillingTemplate(pileBillingTemplate);
// 获取到站点下所有的桩
List<PileDetailVO> pileList = pileBasicInfoService.selectPileListByStationIds(Lists.newArrayList(Long.valueOf(dto.getStationId())));
if (CollectionUtils.isNotEmpty(pileList)) {
// 删除缓存
List<String> collect = pileList.parallelStream()
.map(vo -> CacheConstants.BILLING_TEMPLATE_BY_PILE_SN + vo.getPileSn())
.collect(Collectors.toList());
redisCache.deleteObject(collect);
// 下发计费模板, 电单车不支持
if (StringUtils.equals(billingTemplateVO.getDeviceType(), Constants.ONE)) {
// 下发指令
pileList.parallelStream().forEach(pileInfoVO -> publishPileBillingTemplate(pileInfoVO.getPileSn(), billingTemplateVO));
}
}
// 修改计费模板状态
pileBillingTemplateService.changeStationTemplate(dto.getStationId(), dto.getTemplateId(), billingTemplateVO.getDeviceType(), billingTemplateVO.getMemberFlag());
return true;
}
// public boolean publishBillingTemplateOld(PublishBillingTemplateDTO dto) {
// // 获取计费模板信息
// BillingTemplateVO billingTemplateVO = pileBillingTemplateService.selectBillingTemplateByTemplateId(dto.getTemplateId());
// if (billingTemplateVO == null) {
// log.warn("获取计费模板信息, 通过模板id:{}查询计费模板为null", dto.getTemplateId());
// return false;
// }
// // 会员优惠计费模板不发布
// if (Constants.ONE.equals(billingTemplateVO.getMemberFlag())) {
// return false;
// }
// // 电单车计费模板不发布
// if (Constants.TWO.equals(billingTemplateVO.getDeviceType())) {
// return false;
// }
// // 更新计费模板的发布时间
// PileBillingTemplate pileBillingTemplate = new PileBillingTemplate();
// pileBillingTemplate.setId(Long.valueOf(billingTemplateVO.getTemplateId()));
// pileBillingTemplate.setPublishTime(new Date());
// pileBillingTemplateService.updatePileBillingTemplate(pileBillingTemplate);
// // 获取到站点下所有的桩
// List<PileDetailVO> pileList = pileBasicInfoService.selectPileListByStationIds(Lists.newArrayList(Long.valueOf(dto.getStationId())));
// if (CollectionUtils.isNotEmpty(pileList)) {
// // 删除缓存
// List<String> collect = pileList.parallelStream()
// .map(vo -> CacheConstants.BILLING_TEMPLATE_BY_PILE_SN + vo.getPileSn())
// .collect(Collectors.toList());
// redisCache.deleteObject(collect);
// // 下发计费模板, 电单车不支持
// if (StringUtils.equals(billingTemplateVO.getDeviceType(), Constants.ONE)) {
// // 下发指令
// pileList.parallelStream().forEach(pileInfoVO -> publishPileBillingTemplate(pileInfoVO.getPileSn(), billingTemplateVO));
// }
// }
// // 修改计费模板状态
// pileBillingTemplateService.changeStationTemplate(dto.getStationId(), dto.getTemplateId(), billingTemplateVO.getDeviceType(), billingTemplateVO.getMemberFlag());
// return true;
// }
/**
* 下发计费模板

14
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java
View File

@@ -259,5 +259,19 @@ public class AdapayMemberAccountServiceImpl implements AdapayMemberAccountServic
return pileMerchantInfo.getMerchantName();
}
@Override
public void deleteAccountByMerchantId(String merchantId) {
adapayMemberAccountMapper.deleteAccountByMerchantId(merchantId);
}
/**
* 根据运营商id查询最近一条的信息
* @param merchantId
* @return
*/
@Override
public AdapayMemberAccount selectRecentInfoByMerchantId(String merchantId) {
return adapayMemberAccountMapper.selectRecentInfoByMerchantId(merchantId);
}
}

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

@@ -4558,6 +4558,12 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
*/
@Override
public OrderBasicInfo saveOrderForEV(GenerateOrderDTO dto) throws ParseException {
String pileConnectorCode = dto.getPileSn() + dto.getConnectorCode();
// 先根据枪口号查询是否有未启动的并充订单
OrderBasicInfo orderBasicInfo = selectNotStartMergeOrder(pileConnectorCode);
if (orderBasicInfo != null) {
return orderBasicInfo;
}
String orderCode = generateNewOrderCode();
String transactionCode = dto.getTransactionCode();
if (StringUtils.isBlank(transactionCode)) {
@@ -4574,16 +4580,17 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
String merchantId = pileStationInfo != null ? String.valueOf(pileStationInfo.getMerchantId()) : "";
String plateNumber = dto.getPlateNumber() != null ? dto.getPlateNumber() : "";
// 订单基本信息
OrderBasicInfo orderBasicInfo = OrderBasicInfo.builder()
orderBasicInfo = OrderBasicInfo.builder()
.orderCode(orderCode)
.transactionCode(transactionCode)
.orderStatus(OrderStatusEnum.NOT_START.getValue())
.orderType(OrderTypeEnum.NORMAL_ORDER.getValue()) // 订单类型（1-普通订单；2-并充订单）
.memberId(dto.getMemberId())
.stationId(stationId)
.merchantId(merchantId)
.pileSn(dto.getPileSn())
.connectorCode(dto.getConnectorCode())
.pileConnectorCode(dto.getPileSn() + dto.getConnectorCode())
.pileConnectorCode(pileConnectorCode)
.startMode(dto.getStartMode())
.payStatus(Constants.ZERO)
// .payAmount(dto.getChargeAmount()) // 支付完成后填入支付金额
@@ -4594,6 +4601,18 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
.settleAmount(BigDecimal.ZERO)
.startType(dto.getStartType())
.build();
if (StringUtils.equals(OrderTypeEnum.MERGE_CHARGE_ORDER.getValue(), dto.getOrderType())) {
// 并充订单
orderBasicInfo.setOrderType(dto.getOrderType());
if (StringUtils.isNotBlank(dto.getMergeChargeNumber())) {
// 并充订单序号
orderBasicInfo.setMergeChargeNumber(dto.getMergeChargeNumber());
}
if (StringUtils.isNotBlank(dto.getMainConnectorCode())) {
// 主枪枪编号
orderBasicInfo.setMainConnectorCode(dto.getMainConnectorCode());
}
}
if (StringUtils.equals(dto.getStartMode(), StartModeEnum.AUTH_CARD.getValue())) {
// 鉴权卡启动
orderBasicInfo.setLogicCard(dto.getPileAuthCardInfo().getLogicCard());
@@ -4668,6 +4687,19 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
return orderBasicInfo;
}
/**
* 查询未启动的并充订单
* @param pileConnectorCode
* @return
*/
private OrderBasicInfo selectNotStartMergeOrder(String pileConnectorCode) {
OrderBasicInfo orderBasicInfo = new OrderBasicInfo();
orderBasicInfo.setOrderType(OrderTypeEnum.MERGE_CHARGE_ORDER.getValue());
orderBasicInfo.setOrderStatus(OrderStatusEnum.NOT_START.getValue());
orderBasicInfo.setPileConnectorCode(pileConnectorCode);
return getOrderBasicInfo(orderBasicInfo);
}
/**
* 保存电单车订单信息
* @param dto
@@ -5158,5 +5190,55 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
logger.info("设置订单待补缴金额, orderCode:{}, supplementAmount:{}, 备注:{}", dto.getOrderCode(), dto.getSupplementAmount(), dto.getRemark());
}
/**
* 鉴权并充订单
* @param dto
* @return
*/
@Override
public Map<String, Object> verifyMergeChargeOrder(VerifyMergeChargeOrderDTO dto) throws Exception {
Map<String, Object> map = new LinkedHashMap<>();
GenerateOrderDTO generateOrderDTO = new GenerateOrderDTO();
generateOrderDTO.setPileSn(dto.getPileSn());
generateOrderDTO.setConnectorCode(dto.getConnectorCode());
generateOrderDTO.setMergeChargeNumber(dto.getMergeChargeNumber());
// 判断是否为主枪
if (StringUtils.equals(Constants.DOUBLE_ZERO, dto.getConnectorMark())) {
// 主枪
generateOrderDTO.setMainConnectorCode(dto.getPileConnectorCode());
}
// 区分是卡还是vin充电
String startMode = dto.getStartMode();
if (StringUtils.equals(Constants.ZERO_ONE, startMode)) {
// 刷卡鉴权
// 根据卡号查询用户信息
String physicsCard = dto.getPhysicsCard();
PileAuthCard pileAuthCardInfo = pileAuthCardService.selectCardInfoByLogicCard(physicsCard);
if (pileAuthCardInfo == null) {
// 未查到此卡信息
throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARD_HAS_NO_INFO);
}
generateOrderDTO.setPileAuthCardInfo(pileAuthCardInfo);
generateOrderDTO.setStartMode(StartModeEnum.AUTH_CARD.getValue());
generateOrderDTO.setMemberId(pileAuthCardInfo.getMemberId());
}else if (StringUtils.equals(Constants.ZERO_THREE, startMode)) {
// vin鉴权
// 根据vin查询绑定用户信息
String vinCode = dto.getVinCode();
MemberPlateNumberRelation memberInfo = memberPlateNumberRelationService.getMemberPlateInfoByVinCode(vinCode);
if (memberInfo == null) {
throw new BusinessException(ReturnCodeEnum.CODE_THIS_VIN_INFO_IS_NULL);
}
generateOrderDTO.setMemberPlateNumberRelation(memberInfo);
generateOrderDTO.setStartMode(StartModeEnum.VIN_CODE.getValue());
generateOrderDTO.setMemberId(memberInfo.getMemberId());
}
// 鉴权通过，生成订单启动充电
map = generateOrderByCard(generateOrderDTO);
return map;
}
}

16
jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml
View File

@@ -528,4 +528,20 @@
where del_flag = '0'
and adapay_member_id = #{memberId,jdbcType=VARCHAR}
</select>
<update id="deleteAccountByMerchantId">
update
adapay_member_account
set del_flag = '0'
where merchant_id = #{merchantId,jdbcType=VARCHAR}
</update>
<select id="selectRecentInfoByMerchantId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from adapay_member_account
where merchant_id = #{merchantId,jdbcType=VARCHAR}
order by create_time desc
limit 1
</select>
</mapper>

5
jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml
View File

@@ -182,7 +182,10 @@
from member_wallet_info
where del_flag = '0'
and member_id = #{memberId,jdbcType=INTEGER}
and merchant_id = #{merchantId,jdbcType=VARCHAR}
<if test="merchantId != null">
and merchant_id = #{merchantId,jdbcType=VARCHAR}
</if>
</select>
<select id="selectByMemberWalletList" resultMap="BaseResultMap">

117
jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
View File

@@ -8,6 +8,9 @@
<result column="order_code" jdbcType="VARCHAR" property="orderCode"/>
<result column="transaction_code" jdbcType="VARCHAR" property="transactionCode"/>
<result column="order_status" jdbcType="VARCHAR" property="orderStatus"/>
<result column="order_type" jdbcType="VARCHAR" property="orderType"/>
<result column="merge_charge_number" jdbcType="VARCHAR" property="mergeChargeNumber"/>
<result column="main_connector_code" jdbcType="VARCHAR" property="mainConnectorCode"/>
<result column="member_id" jdbcType="VARCHAR" property="memberId"/>
<result column="station_id" jdbcType="VARCHAR" property="stationId"/>
<result column="merchant_id" jdbcType="VARCHAR" property="merchantId"/>
@@ -50,7 +53,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, order_code, transaction_code, order_status, member_id, station_id, merchant_id,
id, order_code, transaction_code, order_status, order_type, merge_charge_number, main_connector_code, member_id, station_id, merchant_id,
pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode, third_party_type,
pay_mode, pay_status, pay_amount, pay_time, plate_number, order_amount, virtual_amount,
group_code, discount_amount, settle_amount, actual_received_amount, remedial_amount, charge_start_time, charge_end_time,
@@ -73,7 +76,7 @@
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderBasicInfo"
useGeneratedKeys="true">
<!--@mbg.generated-->
insert into order_basic_info (order_code, transaction_code, order_status,
insert into order_basic_info (order_code, transaction_code, order_status, order_type, merge_charge_number, main_connector_code,
member_id, station_id, merchant_id,
pile_sn, connector_code, pile_connector_code,
logic_card, vin_code, start_mode,
@@ -89,6 +92,7 @@
update_by, update_time, del_flag
)
values (#{orderCode,jdbcType=VARCHAR}, #{transactionCode,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR},
#{orderType,jdbcType=VARCHAR}, #{mergeChargeNumber,jdbcType=VARCHAR}, #{mainConnectorCode,jdbcType=VARCHAR},
#{memberId,jdbcType=VARCHAR}, #{stationId,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR},
#{pileSn,jdbcType=VARCHAR}, #{connectorCode,jdbcType=VARCHAR}, #{pileConnectorCode,jdbcType=VARCHAR},
#{logicCard,jdbcType=VARCHAR}, #{vinCode,jdbcType=VARCHAR}, #{startMode,jdbcType=VARCHAR},
@@ -118,6 +122,15 @@
<if test="orderStatus != null">
order_status,
</if>
<if test="orderType != null">
order_type,
</if>
<if test="mergeChargeNumber != null">
merge_charge_number,
</if>
<if test="mainConnectorCode != null">
main_connector_code,
</if>
<if test="memberId != null">
member_id,
</if>
@@ -246,6 +259,15 @@
<if test="orderStatus != null">
#{orderStatus,jdbcType=VARCHAR},
</if>
<if test="orderType != null">
#{orderType,jdbcType=VARCHAR},
</if>
<if test="mergeChargeNumber != null">
#{mergeChargeNumber,jdbcType=VARCHAR},
</if>
<if test="mainConnectorCode != null">
#{mainConnectorCode,jdbcType=VARCHAR},
</if>
<if test="memberId != null">
#{memberId,jdbcType=VARCHAR},
</if>
@@ -378,6 +400,15 @@
<if test="orderStatus != null">
order_status = #{orderStatus,jdbcType=VARCHAR},
</if>
<if test="orderType != null">
order_type = #{orderType,jdbcType=VARCHAR},
</if>
<if test="mergeChargeNumber != null">
merge_charge_number = #{mergeChargeNumber,jdbcType=VARCHAR},
</if>
<if test="mainConnectorCode != null">
main_connector_code = #{mainConnectorCode,jdbcType=VARCHAR},
</if>
<if test="memberId != null">
member_id = #{memberId,jdbcType=VARCHAR},
</if>
@@ -504,6 +535,9 @@
set order_code = #{orderCode,jdbcType=VARCHAR},
transaction_code = #{transactionCode,jdbcType=VARCHAR},
order_status = #{orderStatus,jdbcType=VARCHAR},
order_type = #{orderType,jdbcType=VARCHAR},
merge_charge_number = #{mergeChargeNumber,jdbcType=VARCHAR},
main_connector_code = #{mainConnectorCode,jdbcType=VARCHAR},
member_id = #{memberId,jdbcType=VARCHAR},
station_id = #{stationId,jdbcType=VARCHAR},
merchant_id = #{merchantId,jdbcType=VARCHAR},
@@ -564,6 +598,21 @@
when id = #{item.id,jdbcType=INTEGER} then #{item.orderStatus,jdbcType=VARCHAR}
</foreach>
</trim>
<trim prefix="order_type = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.orderType,jdbcType=VARCHAR}
</foreach>
</trim>
<trim prefix="merge_charge_number = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.mergeChargeNumber,jdbcType=VARCHAR}
</foreach>
</trim>
<trim prefix="main_connector_code = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.mainConnectorCode,jdbcType=VARCHAR}
</foreach>
</trim>
<trim prefix="member_id = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.memberId,jdbcType=VARCHAR}
@@ -790,6 +839,27 @@
</if>
</foreach>
</trim>
<trim prefix="order_type = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.orderType != null">
when id = #{item.id,jdbcType=INTEGER} then #{item.orderType,jdbcType=VARCHAR}
</if>
</foreach>
</trim>
<trim prefix="merge_charge_number = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.mergeChargeNumber != null">
when id = #{item.id,jdbcType=INTEGER} then #{item.mergeChargeNumber,jdbcType=VARCHAR}
</if>
</foreach>
</trim>
<trim prefix="main_connector_code = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.mainConnectorCode != null">
when id = #{item.id,jdbcType=INTEGER} then #{item.mainConnectorCode,jdbcType=VARCHAR}
</if>
</foreach>
</trim>
<trim prefix="member_id = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.memberId != null">
@@ -1072,7 +1142,7 @@
<insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into order_basic_info
(order_code, transaction_code, order_status, member_id, station_id, merchant_id,
(order_code, transaction_code, order_status, order_type, merge_charge_number, main_connector_code, member_id, station_id, merchant_id,
pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode,
third_party_type, pay_mode, pay_status, pay_amount, pay_time, plate_number, order_amount,
virtual_amount, group_code, discount_amount, settle_amount, actual_received_amount, remedial_amount, charge_start_time,
@@ -1083,7 +1153,7 @@
values
<foreach collection="list" item="item" separator=",">
(#{item.orderCode,jdbcType=VARCHAR}, #{item.transactionCode,jdbcType=VARCHAR},
#{item.orderStatus,jdbcType=VARCHAR},
#{item.orderStatus,jdbcType=VARCHAR}, #{item.orderType,jdbcType=VARCHAR}, #{item.mergeChargeNumber,jdbcType=VARCHAR}, #{item.mainConnectorCode,jdbcType=VARCHAR},
#{item.memberId,jdbcType=VARCHAR}, #{item.stationId,jdbcType=VARCHAR}, #{item.merchantId,jdbcType=VARCHAR},
#{item.pileSn,jdbcType=VARCHAR}, #{item.connectorCode,jdbcType=VARCHAR},
#{item.pileConnectorCode,jdbcType=VARCHAR},
@@ -1120,6 +1190,9 @@
order_code,
transaction_code,
order_status,
order_type,
merge_charge_number,
main_connector_code,
member_id,
station_id,
merchant_id,
@@ -1168,6 +1241,9 @@
#{orderCode,jdbcType=VARCHAR},
#{transactionCode,jdbcType=VARCHAR},
#{orderStatus,jdbcType=VARCHAR},
#{orderType,jdbcType=VARCHAR},
#{mergeChargeNumber,jdbcType=VARCHAR},
#{mainConnectorCode,jdbcType=VARCHAR},
#{memberId,jdbcType=VARCHAR},
#{stationId,jdbcType=VARCHAR},
#{merchantId,jdbcType=VARCHAR},
@@ -1216,6 +1292,9 @@
order_code = #{orderCode,jdbcType=VARCHAR},
transaction_code = #{transactionCode,jdbcType=VARCHAR},
order_status = #{orderStatus,jdbcType=VARCHAR},
order_type = #{orderType,jdbcType=VARCHAR},
merge_charge_number = #{mergeChargeNumber,jdbcType=VARCHAR},
main_connector_code = #{mainConnectorCode,jdbcType=VARCHAR},
member_id = #{memberId,jdbcType=VARCHAR},
station_id = #{stationId,jdbcType=VARCHAR},
merchant_id = #{merchantId,jdbcType=VARCHAR},
@@ -1274,6 +1353,15 @@
<if test="orderStatus != null">
order_status,
</if>
<if test="orderType != null">
order_type,
</if>
<if test="mergeChargeNumber != null">
merge_charge_number,
</if>
<if test="mainConnectorCode != null">
main_connector_code,
</if>
<if test="memberId != null">
member_id,
</if>
@@ -1406,6 +1494,15 @@
<if test="orderStatus != null">
#{orderStatus,jdbcType=VARCHAR},
</if>
<if test="orderType != null">
#{orderType,jdbcType=VARCHAR},
</if>
<if test="mergeChargeNumber != null">
#{mergeChargeNumber,jdbcType=VARCHAR},
</if>
<if test="mainConnectorCode != null">
#{mainConnectorCode,jdbcType=VARCHAR},
</if>
<if test="memberId != null">
#{memberId,jdbcType=VARCHAR},
</if>
@@ -1538,6 +1635,15 @@
<if test="orderStatus != null">
order_status = #{orderStatus,jdbcType=VARCHAR},
</if>
<if test="orderType != null">
order_type = #{orderType,jdbcType=VARCHAR},
</if>
<if test="mergeChargeNumber != null">
merge_charge_number = #{mergeChargeNumber,jdbcType=VARCHAR},
</if>
<if test="mainConnectorCode != null">
main_connector_code = #{mainConnectorCode,jdbcType=VARCHAR},
</if>
<if test="memberId != null">
member_id = #{memberId,jdbcType=VARCHAR},
</if>
@@ -2661,6 +2767,9 @@
<if test="startMode != null and startMode != ''">
AND start_mode = #{startMode,jdbcType=VARCHAR}
</if>
<if test="orderType != null and startMode != ''" >
and order_type = #{orderType,jdbcType=VARCHAR}
</if>
order by create_time desc
limit 1
</select>

1
jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
View File

@@ -427,6 +427,7 @@
t2.template_code AS templateCode,
t2.`name` AS templateName,
t2.type as deviceType,
t2.member_flag as memberFlag,
t3.electricity_price AS sharpElectricityPrice,
t3.service_price AS sharpServicePrice,
t3.apply_time AS sharpApplyDate,