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

Merge branch 'dev' into feature-BI

Browse Source
This commit is contained in:
Lemon
2026-05-25 09:28:54 +08:00
parent 8e665212dd eb5d1ce9bf
commit a3fdff2a63
27 changed files with 1376 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberWalletInfo.java
View File

@@ -22,7 +22,7 @@ public class MemberWalletInfo {
/**
* 主键
*/
private Integer id;
private Long id;
/**
* 会员id
@@ -66,4 +66,4 @@ public class MemberWalletInfo {
* 删除标识(0-正常;1-删除)
*/
private String delFlag;
}
}

14
jsowell-pile/src/main/java/com/jsowell/pile/dto/BatchImportMemberBalanceResultDTO.java Normal file
View File

@@ -0,0 +1,14 @@
package com.jsowell.pile.dto;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class BatchImportMemberBalanceResultDTO {
private int totalCount;
private int successCount;
private int failCount;
private List<ImportMemberBalanceItemResultDTO> failedList = new ArrayList<>();
}

23
jsowell-pile/src/main/java/com/jsowell/pile/dto/ImportMemberBalanceDTO.java Normal file
View File

@@ -0,0 +1,23 @@
package com.jsowell.pile.dto;
import com.jsowell.common.annotation.Excel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ImportMemberBalanceDTO {
// 手机号
@Excel(name = "phone")
private String phone;
// 余额
@Excel(name = "balance/100")
private BigDecimal balance;
}

25
jsowell-pile/src/main/java/com/jsowell/pile/dto/ImportMemberBalanceItemResultDTO.java Normal file
View File

@@ -0,0 +1,25 @@
package com.jsowell.pile.dto;
import lombok.Data;
@Data
public class ImportMemberBalanceItemResultDTO {
private boolean success;
private String phone;
private String errorMessage;
public static ImportMemberBalanceItemResultDTO success(String phone) {
ImportMemberBalanceItemResultDTO result = new ImportMemberBalanceItemResultDTO();
result.setSuccess(true);
result.setPhone(phone);
return result;
}
public static ImportMemberBalanceItemResultDTO fail(String phone, String errorMessage) {
ImportMemberBalanceItemResultDTO result = new ImportMemberBalanceItemResultDTO();
result.setSuccess(false);
result.setPhone(phone);
result.setErrorMessage(errorMessage);
return result;
}
}

8
jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java
View File

@@ -93,6 +93,14 @@ public interface MemberBasicInfoMapper {
*/
MemberBasicInfo selectInfoByMemberId(String memberId);
/**
* 判断会员id是否已存在。
*
* @param memberId 会员id
* @return 1-存在；null-不存在
*/
Integer existsByMemberId(@Param("memberId") String memberId);
/**
* 更新会员余额
* @param memberId 会员id

4
jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java
View File

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface MemberWalletInfoMapper {
int deleteByPrimaryKey(Integer id);
int deleteByPrimaryKey(Long id);
int insert(MemberWalletInfo record);
@@ -17,7 +17,7 @@ public interface MemberWalletInfoMapper {
int insertSelective(MemberWalletInfo record);
MemberWalletInfo selectByPrimaryKey(Integer id);
MemberWalletInfo selectByPrimaryKey(Long id);
int updateByPrimaryKeySelective(MemberWalletInfo record);

9
jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileFirmwareInfoMapper.java
View File

@@ -1,6 +1,7 @@
package com.jsowell.pile.mapper;
import com.jsowell.pile.domain.PileFirmwareInfo;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -29,6 +30,14 @@ public interface PileFirmwareInfoMapper {
*/
public List<PileFirmwareInfo> selectPileFirmwareInfoList(PileFirmwareInfo pileFirmwareInfo);
/**
* 根据固件名称查询充电桩固件信息
*
* @param name 固件名称
* @return 充电桩固件信息
*/
public PileFirmwareInfo checkNameUnique(@Param("name") String name);
/**
* 新增充电桩固件信息
*

8
jsowell-pile/src/main/java/com/jsowell/pile/service/MemberBasicInfoService.java
View File

@@ -91,6 +91,14 @@ public interface MemberBasicInfoService {
*/
MemberBasicInfo selectInfoByMemberId(String memberId);
/**
* 判断指定会员id是否已经存在。
*
* @param memberId 会员id
* @return true-已存在；false-不存在
*/
boolean existsByMemberId(String memberId);
String generateWalletCode();
/**

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

@@ -6,13 +6,13 @@ import com.jsowell.pile.vo.base.MemberWalletVO;
import java.util.List;
public interface MemberWalletInfoService {
int deleteByPrimaryKey(Integer id);
int deleteByPrimaryKey(Long id);
int insert(MemberWalletInfo record);
int insertSelective(MemberWalletInfo record);
MemberWalletInfo selectByPrimaryKey(Integer id);
MemberWalletInfo selectByPrimaryKey(Long id);
MemberWalletInfo selectByMemberId(String memberId, String merchantId);

8
jsowell-pile/src/main/java/com/jsowell/pile/service/PileFirmwareInfoService.java
View File

@@ -30,6 +30,14 @@ public interface PileFirmwareInfoService {
*/
public List<PileFirmwareInfo> selectPileFirmwareInfoList(PileFirmwareInfo pileFirmwareInfo);
/**
* 校验固件名称是否唯一
*
* @param pileFirmwareInfo 充电桩固件信息
* @return 结果
*/
public String checkNameUnique(PileFirmwareInfo pileFirmwareInfo);
/**
* 新增充电桩固件信息
*

22
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
View File

@@ -180,6 +180,11 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService {
return memberBasicInfoMapper.selectInfoByMemberId(memberId);
}
@Override
public boolean existsByMemberId(String memberId) {
return memberBasicInfoMapper.existsByMemberId(memberId) != null;
}
/**
* 生成钱包卡号WalletCode
* @return
@@ -267,8 +272,16 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService {
createBy = SecurityUtils.getLoginUser().getUserId() + "";
}
// 查询用户余额
MemberWalletInfo walletInfo = memberWalletInfoService.selectByMemberId(memberId, targetMerchantId);
log.info("修改用户余额-开始查询钱包, memberId:{}, targetMerchantId:{}, type:{}, subType:{}, updatePrincipalBalance:{}, updateGiftBalance:{}",
memberId, targetMerchantId, type, dto.getSubType(), updatePrincipalBalance, updateGiftBalance);
MemberWalletInfo walletInfo;
try {
walletInfo = memberWalletInfoService.selectByMemberId(memberId, targetMerchantId);
} catch (Exception e) {
log.error("修改用户余额-查询钱包异常, memberId:{}, targetMerchantId:{}, memberIdLength:{}, exceptionType:{}",
memberId, targetMerchantId, memberId == null ? null : memberId.length(), e.getClass().getName(), e);
throw e;
}
log.info("修改用户余额-根据会员id:{}, 目标运营商id:{}, 查询结果:{}", memberId, targetMerchantId, JSON.toJSONString(walletInfo));
if (walletInfo == null) {
log.info("修改用户余额-根据会员id:{}, 目标运营商id:{}, 查询会员信息为空, 新建会员钱包", memberId, targetMerchantId);
@@ -282,6 +295,11 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService {
.version(0)
.build();
memberWalletInfoService.insertSelective(walletInfo);
log.info("修改用户余额-会员钱包创建完成, memberId:{}, targetMerchantId:{}, walletId:{}, walletCode:{}",
memberId, targetMerchantId, walletInfo.getId(), walletInfo.getWalletCode());
} else {
log.info("修改用户余额-命中会员钱包, memberId:{}, targetMerchantId:{}, walletId:{}, walletCode:{}, version:{}",
memberId, targetMerchantId, walletInfo.getId(), walletInfo.getWalletCode(), walletInfo.getVersion());
}
// 钱包编号

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

@@ -25,7 +25,7 @@ public class MemberWalletInfoServiceImpl implements MemberWalletInfoService {
private PileMerchantInfoService pileMerchantInfoService;
@Override
public int deleteByPrimaryKey(Integer id) {
public int deleteByPrimaryKey(Long id) {
return memberWalletInfoMapper.deleteByPrimaryKey(id);
}
@@ -40,7 +40,7 @@ public class MemberWalletInfoServiceImpl implements MemberWalletInfoService {
}
@Override
public MemberWalletInfo selectByPrimaryKey(Integer id) {
public MemberWalletInfo selectByPrimaryKey(Long id) {
return memberWalletInfoMapper.selectByPrimaryKey(id);
}

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

@@ -662,12 +662,12 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
logger.error("启动失败退款, orderCode:{}, transactionCode:{}, 执行订单结算逻辑发生异常", orderInfo.getOrderCode(),transactionCode, e);
}
// 退保险金额
try {
refundInsurance(orderInfo);
} catch (Exception e) {
logger.error("启动失败退款, orderCode:{}, transactionCode:{}, 退保险发生异常", orderInfo.getOrderCode(),transactionCode, e);
}
// 退保险金额 2025-05-18注释，支付成功未启动订单，保险费退款集成到订单退款中
// try {
// refundInsurance(orderInfo);
// } catch (Exception e) {
// logger.error("启动失败退款, orderCode:{}, transactionCode:{}, 退保险发生异常", orderInfo.getOrderCode(),transactionCode, e);
// }
}
/**
@@ -2101,6 +2101,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
List<BalanceDeductionAmountVO> resultList = Lists.newArrayList();
// 查询会员的余额充值记录 按照充值时间正序
List<MemberAdapayRecord> memberAdapayRecords = memberAdapayRecordService.selectAvailableBalance(memberId);
// 筛选该list最近一年的数据
memberAdapayRecords = memberAdapayRecords.stream()
.filter(record -> DateUtils.date2LocalDateTime(record.getCreateTime())
.isAfter(LocalDateTime.now().minusYears(1)))
.collect(Collectors.toList());
// 定义一个临时金额等于消费金额
BigDecimal tempAmount = new BigDecimal(amount.toString());

18
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java
View File

@@ -3,8 +3,10 @@ package com.jsowell.pile.service.impl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.constant.UserConstants;
import com.jsowell.common.core.page.PageResponse;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.file.AliyunOssUploadUtils;
import com.jsowell.pile.domain.PileFirmwareInfo;
import com.jsowell.pile.domain.PileReservationInfo;
@@ -50,6 +52,22 @@ public class PileFirmwareInfoServiceImpl implements PileFirmwareInfoService {
return pileFirmwareInfoMapper.selectPileFirmwareInfoList(pileFirmwareInfo);
}
/**
* 校验固件名称是否唯一
*
* @param pileFirmwareInfo 充电桩固件信息
* @return 结果
*/
@Override
public String checkNameUnique(PileFirmwareInfo pileFirmwareInfo) {
Long id = StringUtils.isNull(pileFirmwareInfo.getId()) ? -1L : pileFirmwareInfo.getId();
PileFirmwareInfo info = pileFirmwareInfoMapper.checkNameUnique(pileFirmwareInfo.getName());
if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
}
/**
* 新增充电桩固件信息
*