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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-06-15 14:40:11 +08:00
parent cdd2a217c3
commit e1b2be97cc
12 changed files with 49 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberInfoService.java
View File

@@ -1,21 +0,0 @@
package com.jsowell.pile.service;
import com.jsowell.pile.domain.AdapayMemberInfo;
public interface AdapayMemberInfoService {
int deleteByPrimaryKey(Integer id);
int insert(AdapayMemberInfo record);
int insertSelective(AdapayMemberInfo record);
AdapayMemberInfo selectByPrimaryKey(Integer id);
int updateByPrimaryKeySelective(AdapayMemberInfo record);
int updateByPrimaryKey(AdapayMemberInfo record);
AdapayMemberInfo selectByMerchantId(String merchantId);
AdapayMemberInfo selectByStationId(String stationId);
}

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

@@ -60,4 +60,6 @@ public interface IAdapayMemberAccountService {
public int deleteAdapayMemberAccountById(Long id);
AdapayMemberAccount selectByMerchantId(String merchantId);
String selectAdapayMemberIdByStationId(String stationId);
}

63
jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapaySettleAccountService.java
View File

@@ -1,63 +0,0 @@
package com.jsowell.pile.service;
import com.jsowell.pile.domain.AdapaySettleAccount;
import java.util.List;
/**
* 汇付结算账户Service接口
*
* @author jsowell
* @date 2023-06-12
*/
public interface IAdapaySettleAccountService {
/**
* 查询汇付结算账户
*
* @param id 汇付结算账户主键
* @return 汇付结算账户
*/
public AdapaySettleAccount selectAdapaySettleAccountById(Long id);
/**
* 查询汇付结算账户列表
*
* @param adapaySettleAccount 汇付结算账户
* @return 汇付结算账户集合
*/
public List<AdapaySettleAccount> selectAdapaySettleAccountList(AdapaySettleAccount adapaySettleAccount);
/**
* 新增汇付结算账户
*
* @param adapaySettleAccount 汇付结算账户
* @return 结果
*/
public int insertAdapaySettleAccount(AdapaySettleAccount adapaySettleAccount);
/**
* 修改汇付结算账户
*
* @param adapaySettleAccount 汇付结算账户
* @return 结果
*/
public int updateAdapaySettleAccount(AdapaySettleAccount adapaySettleAccount);
/**
* 批量删除汇付结算账户
*
* @param ids 需要删除的汇付结算账户主键集合
* @return 结果
*/
public int deleteAdapaySettleAccountByIds(Long[] ids);
/**
* 删除汇付结算账户信息
*
* @param id 汇付结算账户主键
* @return 结果
*/
public int deleteAdapaySettleAccountById(Long id);
AdapaySettleAccount selectByMerchantId(String merchantId);
}

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

@@ -1,9 +1,13 @@
package com.jsowell.pile.service.impl;
import com.jsowell.common.constant.CacheConstants;
import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.util.DateUtils;
import com.jsowell.pile.domain.AdapayMemberAccount;
import com.jsowell.pile.domain.PileStationInfo;
import com.jsowell.pile.mapper.AdapayMemberAccountMapper;
import com.jsowell.pile.service.IAdapayMemberAccountService;
import com.jsowell.pile.service.IPileStationInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -20,6 +24,12 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
@Autowired
private AdapayMemberAccountMapper adapayMemberAccountMapper;
@Autowired
private IPileStationInfoService pileStationInfoService;
@Autowired
private RedisCache redisCache;
/**
* 查询【请填写功能名称】
*
@@ -90,6 +100,27 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
@Override
public AdapayMemberAccount selectByMerchantId(String merchantId) {
return adapayMemberAccountMapper.selectByMerchantId(merchantId);
String redisKey = CacheConstants.ADAPAY_MEMBER_ACCOUNT + merchantId;
AdapayMemberAccount adapayMemberAccount = redisCache.getCacheObject(redisKey);
if (adapayMemberAccount == null) {
adapayMemberAccount = adapayMemberAccountMapper.selectByMerchantId(merchantId);
if (adapayMemberAccount != null) {
redisCache.setCacheObject(redisKey, adapayMemberAccount, CacheConstants.cache_expire_time_1h);
}
}
return adapayMemberAccount;
}
@Override
public String selectAdapayMemberIdByStationId(String stationId) {
PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(Long.parseLong(stationId));
if (pileStationInfo == null) {
return null;
}
AdapayMemberAccount adapayMemberAccount = selectByMerchantId(pileStationInfo.getMerchantId() + "");
if (adapayMemberAccount == null) {
return null;
}
return adapayMemberAccount.getAdapayMemberId();
}
}

78
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberInfoServiceImpl.java
View File

@@ -1,78 +0,0 @@
package com.jsowell.pile.service.impl;
import com.jsowell.common.constant.CacheConstants;
import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.pile.domain.AdapayMemberInfo;
import com.jsowell.pile.domain.PileStationInfo;
import com.jsowell.pile.mapper.AdapayMemberInfoMapper;
import com.jsowell.pile.service.AdapayMemberInfoService;
import com.jsowell.pile.service.IPileStationInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service
public class AdapayMemberInfoServiceImpl implements AdapayMemberInfoService {
@Resource
private AdapayMemberInfoMapper adapayMemberInfoMapper;
@Autowired
private RedisCache redisCache;
@Autowired
private IPileStationInfoService pileStationInfoService;
@Override
public int deleteByPrimaryKey(Integer id) {
return adapayMemberInfoMapper.deleteByPrimaryKey(id);
}
@Override
public int insert(AdapayMemberInfo record) {
return adapayMemberInfoMapper.insert(record);
}
@Override
public int insertSelective(AdapayMemberInfo record) {
return adapayMemberInfoMapper.insertSelective(record);
}
@Override
public AdapayMemberInfo selectByPrimaryKey(Integer id) {
return adapayMemberInfoMapper.selectByPrimaryKey(id);
}
@Override
public int updateByPrimaryKeySelective(AdapayMemberInfo record) {
return adapayMemberInfoMapper.updateByPrimaryKeySelective(record);
}
@Override
public int updateByPrimaryKey(AdapayMemberInfo record) {
return adapayMemberInfoMapper.updateByPrimaryKey(record);
}
@Override
public AdapayMemberInfo selectByMerchantId(String merchantId) {
String redisKey = CacheConstants.ADAPAY_MEMBER_INFO + merchantId;
AdapayMemberInfo adapayMemberInfo = redisCache.getCacheObject(redisKey);
if (adapayMemberInfo == null) {
adapayMemberInfo = adapayMemberInfoMapper.selectByMerchantId(merchantId);
if (adapayMemberInfo != null) {
redisCache.setCacheObject(redisKey, adapayMemberInfo, CacheConstants.cache_expire_time_1d);
}
}
return adapayMemberInfo;
}
@Override
public AdapayMemberInfo selectByStationId(String stationId) {
PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(Long.parseLong(stationId));
if (pileStationInfo != null) {
return selectByMerchantId(pileStationInfo.getMerchantId() + "");
}
return null;
}
}

95
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapaySettleAccountServiceImpl.java
View File

@@ -1,95 +0,0 @@
package com.jsowell.pile.service.impl;
import com.jsowell.common.util.DateUtils;
import com.jsowell.pile.domain.AdapaySettleAccount;
import com.jsowell.pile.mapper.AdapaySettleAccountMapper;
import com.jsowell.pile.service.IAdapaySettleAccountService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 汇付结算账户Service业务层处理
*
* @author jsowell
* @date 2023-06-12
*/
@Service
public class AdapaySettleAccountServiceImpl implements IAdapaySettleAccountService {
@Autowired
private AdapaySettleAccountMapper adapaySettleAccountMapper;
/**
* 查询汇付结算账户
*
* @param id 汇付结算账户主键
* @return 汇付结算账户
*/
@Override
public AdapaySettleAccount selectAdapaySettleAccountById(Long id) {
return adapaySettleAccountMapper.selectAdapaySettleAccountById(id);
}
/**
* 查询汇付结算账户列表
*
* @param adapaySettleAccount 汇付结算账户
* @return 汇付结算账户
*/
@Override
public List<AdapaySettleAccount> selectAdapaySettleAccountList(AdapaySettleAccount adapaySettleAccount) {
return adapaySettleAccountMapper.selectAdapaySettleAccountList(adapaySettleAccount);
}
/**
* 新增汇付结算账户
*
* @param adapaySettleAccount 汇付结算账户
* @return 结果
*/
@Override
public int insertAdapaySettleAccount(AdapaySettleAccount adapaySettleAccount) {
adapaySettleAccount.setCreateTime(DateUtils.getNowDate());
return adapaySettleAccountMapper.insertAdapaySettleAccount(adapaySettleAccount);
}
/**
* 修改汇付结算账户
*
* @param adapaySettleAccount 汇付结算账户
* @return 结果
*/
@Override
public int updateAdapaySettleAccount(AdapaySettleAccount adapaySettleAccount) {
adapaySettleAccount.setUpdateTime(DateUtils.getNowDate());
return adapaySettleAccountMapper.updateAdapaySettleAccount(adapaySettleAccount);
}
/**
* 批量删除汇付结算账户
*
* @param ids 需要删除的汇付结算账户主键
* @return 结果
*/
@Override
public int deleteAdapaySettleAccountByIds(Long[] ids) {
return adapaySettleAccountMapper.deleteAdapaySettleAccountByIds(ids);
}
/**
* 删除汇付结算账户信息
*
* @param id 汇付结算账户主键
* @return 结果
*/
@Override
public int deleteAdapaySettleAccountById(Long id) {
return adapaySettleAccountMapper.deleteAdapaySettleAccountById(id);
}
@Override
public AdapaySettleAccount selectByMerchantId(String merchantId) {
return adapaySettleAccountMapper.selectByMerchantId(merchantId);
}
}

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

@@ -147,8 +147,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
private ISettleOrderReportService settleOrderReportService;
@Autowired
private AdapayMemberInfoService adapayMemberInfoService;
private IAdapayMemberAccountService adapayMemberAccountService;
/**
* 条件查询订单基本信息
*
@@ -1853,10 +1852,10 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// 分账对象信息
OrderBasicInfo orderBasicInfo = getOrderInfoByOrderCode(dto.getOrderCode());
if (orderBasicInfo != null) {
AdapayMemberInfo adapayMemberInfo = adapayMemberInfoService.selectByStationId(orderBasicInfo.getStationId());
if (adapayMemberInfo != null) {
String adapayMemberId = adapayMemberAccountService.selectAdapayMemberIdByStationId(orderBasicInfo.getStationId());
if (StringUtils.isNotBlank(adapayMemberId)) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("member_id", adapayMemberInfo.getMemberId());
jsonObject.put("member_id", adapayMemberId);
jsonObject.put("amount", amount);
jsonObject.put("fee_flag", Constants.Y);