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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-29 15:37:11 +08:00
parent e8fcde6896
commit 47d7b3f84b
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-admin/src/main/java/com/jsowell/service/PileService.java
View File

@@ -6,6 +6,7 @@ import com.google.common.collect.Lists;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
import com.jsowell.common.core.page.PageResponse;
import com.jsowell.common.enums.DelFlagEnum;
import com.jsowell.common.enums.ykc.BusinessTypeEnum;
import com.jsowell.common.enums.ykc.OrderPayModeEnum;
import com.jsowell.common.enums.ykc.OrderStatusEnum;
@@ -146,7 +147,7 @@ public class PileService {
basicInfo.setSimId(null); // TODO sim卡
basicInfo.setRemark(dto.getRemark()); // 备注
basicInfo.setCreateBy(SecurityUtils.getUsername()); // 创建人
basicInfo.setDelFlag(Constants.DEL_FLAG_NORMAL); // 删除标识
basicInfo.setDelFlag(DelFlagEnum.NORMAL.getValue()); // 删除标识
basicInfoList.add(basicInfo);
for (int i = 1; i < dto.getConnectorNum() + 1; i++) {
@@ -157,7 +158,7 @@ public class PileService {
connectorInfo.setPileConnectorCode(sn + connectorCode); // 枪口号
connectorInfo.setStatus(Constants.ZERO); //状态，默认 0-离网
connectorInfo.setCreateBy(SecurityUtils.getUsername()); // 创建人
connectorInfo.setDelFlag(Constants.DEL_FLAG_NORMAL); // 删除标识
connectorInfo.setDelFlag(DelFlagEnum.NORMAL.getValue()); // 删除标识
connectorInfoList.add(connectorInfo);
}
}

3
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java
View File

@@ -6,6 +6,7 @@ import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.domain.AjaxResult;
import com.jsowell.common.core.page.TableDataInfo;
import com.jsowell.common.enums.BusinessType;
import com.jsowell.common.enums.DelFlagEnum;
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.response.RestApiResponse;
@@ -260,7 +261,7 @@ public class PileStationInfoController extends BaseController {
// 删除对应配置信息
ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
relation.setStationId(dto.getStationId());
relation.setDelFlag("1");
relation.setDelFlag(DelFlagEnum.DELETE.getValue());
thirdPartyStationRelationService.updateThirdPartyStationRelation(relation);
}
logger.info("推送联联平台充电站信息 result:{}", response);

8
jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java
View File

@@ -83,15 +83,7 @@ public class Constants {
public static final String ZERO_ONE = "01";
public static final String ZERO_THREE = "03";
/**
* 删除标识 0标识正常
*/
public static final String DEL_FLAG_NORMAL = "0";
/**
* 删除标识 1标识被删除
*/
public static final String DEL_FLAG_DELETE = "1";
/**
* UTF-8 字符集
*/

4
jsowell-common/src/main/java/com/jsowell/common/enums/DelFlagEnum.java
View File

@@ -4,8 +4,8 @@ package com.jsowell.common.enums;
* 删除标识枚举
*/
public enum DelFlagEnum {
normal("0", "正常"),
delete("1", "删除"),
NORMAL("0", "正常"),
DELETE("1", "删除"),
;
private String value;

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

@@ -24,6 +24,7 @@ import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.enums.AcquirerEnum;
import com.jsowell.common.enums.DelFlagEnum;
import com.jsowell.common.enums.MemberWalletEnum;
import com.jsowell.common.enums.adapay.AdapayStatusEnum;
import com.jsowell.common.enums.ykc.*;
@@ -950,6 +951,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
ClearingBillDetail clearingBillDetail = ClearingBillDetail.builder()
.clearingBillCode(clearingBillCode)
.orderCode(orderCode)
.createTime(DateUtils.getNowDate())
.delFlag(DelFlagEnum.NORMAL.getValue())
.build();
billDetailList.add(clearingBillDetail);
}
@@ -963,6 +966,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
clearingBillInfo.setFeeAmount(feeAmount);
clearingBillInfo.setWithdrawableAmount(withdrawableAmount);
clearingBillInfo.setActualClearingAmount(actualClearingAmount);
clearingBillInfo.setCreateTime(DateUtils.getNowDate());
clearingBillInfo.setDelFlag(DelFlagEnum.NORMAL.getValue());
// 保存清分账单
ClearingBillTransactionDTO dto = new ClearingBillTransactionDTO();

3
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
View File

@@ -8,6 +8,7 @@ import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;
import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.enums.DelFlagEnum;
import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum;
import com.jsowell.common.enums.ykc.PileConnectorStatusEnum;
import com.jsowell.common.util.BytesUtil;
@@ -300,7 +301,7 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
connectorInfo.setPileConnectorCode(pileSn + connectorCode); // 枪口编号
connectorInfo.setStatus(Constants.ZERO); //状态，默认 0-离网
connectorInfo.setCreateBy(SecurityUtils.getUsername()); // 创建人
connectorInfo.setDelFlag(Constants.DEL_FLAG_NORMAL); // 删除标识
connectorInfo.setDelFlag(DelFlagEnum.NORMAL.getValue()); // 删除标识
connectorInfoList.add(connectorInfo);
}
}

6
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java
View File

@@ -169,7 +169,7 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi
billingTemplate.setRemark(dto.getRemark());
billingTemplate.setTemplateCode(templateCode);
billingTemplate.setCreateBy(SecurityUtils.getUsername());
billingTemplate.setDelFlag(DelFlagEnum.normal.getValue());
billingTemplate.setDelFlag(DelFlagEnum.NORMAL.getValue());
if (StringUtils.isBlank(dto.getStationId())) {
// 公共模板标识（0-私有；1-公共）
billingTemplate.setPublicFlag(Constants.ONE);
@@ -604,7 +604,7 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi
stationBillingTemplate.setPublicFlag(Constants.ZERO); // 站点私有计费模板
stationBillingTemplate.setTemplateCode(templateCode);
stationBillingTemplate.setCreateBy(SecurityUtils.getUsername());
stationBillingTemplate.setDelFlag(DelFlagEnum.normal.getValue());
stationBillingTemplate.setDelFlag(DelFlagEnum.NORMAL.getValue());
// 复制计费模板详情
List<PileBillingDetail> stationBillingDetailList = Lists.newArrayList();
PileBillingDetail pileBillingDetail;
@@ -613,7 +613,7 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi
BeanUtils.copyProperties(detail, pileBillingDetail, "id", "templateCode", "createBy", "createTime", "updateBy", "updateTime");
pileBillingDetail.setTemplateCode(templateCode);
pileBillingDetail.setCreateBy(SecurityUtils.getUsername());
pileBillingDetail.setDelFlag(DelFlagEnum.normal.getValue());
pileBillingDetail.setDelFlag(DelFlagEnum.NORMAL.getValue());
stationBillingDetailList.add(pileBillingDetail);
}
// 入库