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

汇付会员表加备注字段

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-11-29 11:55:33 +08:00
parent 943bd69068
commit 8b9f9f0df0
13 changed files with 656 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,7 +67,7 @@ public class AdapayService {
private String ADAPAY_CALLBACK_URL;
@Autowired
private IAdapayMemberAccountService adapayMemberAccountService;
private AdapayMemberAccountService adapayMemberAccountService;
@Autowired
private ClearingWithdrawInfoService clearingWithdrawInfoService;

68
jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayMemberAccount.java
View File

@@ -1,68 +1,74 @@
package com.jsowell.pile.domain;
import com.jsowell.common.annotation.Excel;
import com.jsowell.common.core.domain.BaseEntity;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 【请填写功能名称】对象 adapay_member_account
*
* @author jsowell
* @date 2023-06-15
* 汇付会员账户
*/
@Getter
@Setter
public class AdapayMemberAccount extends BaseEntity {
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class AdapayMemberAccount {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
private Long id;
private Integer id;
/**
* 状态 0-待审核；1-审核通过
* 状态（0-待审核；1-审核通过；2-创建失败）
*/
private String status;
/**
* 运营商id
*/
@Excel(name = "运营商id")
private String merchantId;
/**
* 汇付会员id
*/
@Excel(name = "汇付会员id")
private String adapayMemberId;
/**
* 汇付结算账户id
*/
@Excel(name = "汇付结算账户id")
private String settleAccountId;
/**
* 备注
*/
private String remark;
/**
* 创建时间
*/
private Date createTime;
/**
* 创建人
*/
private String createBy;
/**
* 更新时间
*/
private Date updateTime;
/**
* 更新人
*/
private String updateBy;
/**
* 删除标识（0-正常；1-删除）
*/
private String delFlag;
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
.append("id", getId())
.append("merchantId", getMerchantId())
.append("adapayMemberId", getAdapayMemberId())
.append("settleAccountId", getSettleAccountId())
.append("createTime", getCreateTime())
.append("createBy", getCreateBy())
.append("updateTime", getUpdateTime())
.append("updateBy", getUpdateBy())
.append("delFlag", getDelFlag())
.toString();
}
}
}

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

@@ -1,25 +1,76 @@
package com.jsowell.pile.mapper;
import com.jsowell.pile.domain.AdapayMemberAccount;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* 【请填写功能名称】Mapper接口
*
* @author jsowell
* @date 2023-06-15
*/
@Repository
public interface AdapayMemberAccountMapper {
/**
* delete by primary key
*
* @param id primaryKey
* @return deleteCount
*/
int deleteByPrimaryKey(Integer id);
/**
* insert record to table
*
* @param record the record
* @return insert count
*/
int insert(AdapayMemberAccount record);
int insertOrUpdate(AdapayMemberAccount record);
int insertOrUpdateSelective(AdapayMemberAccount record);
/**
* insert record to table selective
*
* @param record the record
* @return insert count
*/
int insertSelective(AdapayMemberAccount record);
/**
* select by primary key
*
* @param id primary key
* @return object by primary key
*/
AdapayMemberAccount selectByPrimaryKey(Integer id);
/**
* update record selective
*
* @param record the updated record
* @return update count
*/
int updateByPrimaryKeySelective(AdapayMemberAccount record);
/**
* update record
*
* @param record the updated record
* @return update count
*/
int updateByPrimaryKey(AdapayMemberAccount record);
int updateBatch(List<AdapayMemberAccount> list);
int batchInsert(@Param("list") List<AdapayMemberAccount> list);
/**
* 查询【请填写功能名称】
*
* @param id 【请填写功能名称】主键
* @return 【请填写功能名称】
*/
public AdapayMemberAccount selectAdapayMemberAccountById(Long id);
AdapayMemberAccount selectAdapayMemberAccountById(Long id);
/**
* 查询【请填写功能名称】列表
@@ -27,7 +78,7 @@ public interface AdapayMemberAccountMapper {
* @param adapayMemberAccount 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
public List<AdapayMemberAccount> selectAdapayMemberAccountList(AdapayMemberAccount adapayMemberAccount);
List<AdapayMemberAccount> selectAdapayMemberAccountList(AdapayMemberAccount adapayMemberAccount);
/**
* 新增【请填写功能名称】
@@ -35,7 +86,7 @@ public interface AdapayMemberAccountMapper {
* @param adapayMemberAccount 【请填写功能名称】
* @return 结果
*/
public int insertAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount);
int insertAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount);
/**
* 修改【请填写功能名称】
@@ -43,7 +94,7 @@ public interface AdapayMemberAccountMapper {
* @param adapayMemberAccount 【请填写功能名称】
* @return 结果
*/
public int updateAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount);
int updateAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount);
/**
* 删除【请填写功能名称】
@@ -51,7 +102,7 @@ public interface AdapayMemberAccountMapper {
* @param id 【请填写功能名称】主键
* @return 结果
*/
public int deleteAdapayMemberAccountById(Long id);
int deleteAdapayMemberAccountById(Long id);
/**
* 批量删除【请填写功能名称】
@@ -59,7 +110,7 @@ public interface AdapayMemberAccountMapper {
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteAdapayMemberAccountByIds(Long[] ids);
int deleteAdapayMemberAccountByIds(Long[] ids);
AdapayMemberAccount selectByMerchantId(String merchantId);
@@ -68,4 +119,4 @@ public interface AdapayMemberAccountMapper {
void updateAdapayMemberAccountByMemberId(AdapayMemberAccount adapayMemberAccount);
AdapayMemberAccount selectByMemberId(String memberId);
}
}

71
jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberAccountService.java Normal file
View File

@@ -0,0 +1,71 @@
package com.jsowell.pile.service;
import com.jsowell.pile.domain.AdapayMemberAccount;
import java.util.List;
public interface AdapayMemberAccountService {
int insert(AdapayMemberAccount record);
int insertOrUpdate(AdapayMemberAccount record);
int insertOrUpdateSelective(AdapayMemberAccount record);
int insertSelective(AdapayMemberAccount record);
AdapayMemberAccount selectByPrimaryKey(Integer id);
int updateByPrimaryKeySelective(AdapayMemberAccount record);
int updateByPrimaryKey(AdapayMemberAccount record);
int updateBatch(List<AdapayMemberAccount> list);
int batchInsert(List<AdapayMemberAccount> list);
/**
* 查询【请填写功能名称】列表
*
* @param adapayMemberAccount 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
List<AdapayMemberAccount> selectAdapayMemberAccountList(AdapayMemberAccount adapayMemberAccount);
List<AdapayMemberAccount> selectAdapayMemberAccountList(String merchantId);
/**
* 新增【请填写功能名称】
*
* @param adapayMemberAccount 【请填写功能名称】
* @return 结果
*/
int insertAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount);
/**
* 修改【请填写功能名称】
*
* @param adapayMemberAccount 【请填写功能名称】
* @return 结果
*/
int updateAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount);
/**
* 批量删除【请填写功能名称】
*
* @param ids 需要删除的【请填写功能名称】主键集合
* @return 结果
*/
int deleteAdapayMemberAccountByIds(Long[] ids);
AdapayMemberAccount selectByMerchantId(String merchantId);
AdapayMemberAccount selectByMemberId(String memberId);
void updateAdapayMemberAccountByMemberId(AdapayMemberAccount adapayMemberAccount);
AdapayMemberAccount getDefault();
}

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

@@ -1,75 +0,0 @@
package com.jsowell.pile.service;
import com.jsowell.pile.domain.AdapayMemberAccount;
import java.util.List;
/**
* 【请填写功能名称】Service接口
*
* @author jsowell
* @date 2023-06-15
*/
public interface IAdapayMemberAccountService {
/**
* 查询【请填写功能名称】
*
* @param id 【请填写功能名称】主键
* @return 【请填写功能名称】
*/
public AdapayMemberAccount selectAdapayMemberAccountById(Long id);
/**
* 查询【请填写功能名称】列表
*
* @param adapayMemberAccount 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
public List<AdapayMemberAccount> selectAdapayMemberAccountList(AdapayMemberAccount adapayMemberAccount);
public List<AdapayMemberAccount> selectAdapayMemberAccountList(String merchantId);
/**
* 新增【请填写功能名称】
*
* @param adapayMemberAccount 【请填写功能名称】
* @return 结果
*/
public int insertAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount);
/**
* 修改【请填写功能名称】
*
* @param adapayMemberAccount 【请填写功能名称】
* @return 结果
*/
public int updateAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount);
/**
* 批量删除【请填写功能名称】
*
* @param ids 需要删除的【请填写功能名称】主键集合
* @return 结果
*/
public int deleteAdapayMemberAccountByIds(Long[] ids);
/**
* 删除【请填写功能名称】信息
*
* @param id 【请填写功能名称】主键
* @return 结果
*/
public int deleteAdapayMemberAccountById(Long id);
AdapayMemberAccount selectByMerchantId(String merchantId);
AdapayMemberAccount selectByMemberId(String memberId);
String selectAdapayMemberIdByStationId(String stationId);
void deleteByMemberId(String memberId);
void updateAdapayMemberAccountByMemberId(AdapayMemberAccount adapayMemberAccount);
AdapayMemberAccount getDefault();
}

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

@@ -7,9 +7,8 @@ import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.StringUtils;
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.AdapayMemberAccountService;
import com.jsowell.pile.service.IPileStationInfoService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +24,7 @@ import java.util.List;
*/
@Slf4j
@Service
public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountService {
public class AdapayMemberAccountServiceImpl implements AdapayMemberAccountService {
@Autowired
private AdapayMemberAccountMapper adapayMemberAccountMapper;
@@ -35,16 +34,7 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
@Autowired
private RedisCache redisCache;
/**
* 查询【请填写功能名称】
*
* @param id 【请填写功能名称】主键
* @return 【请填写功能名称】
*/
@Override
public AdapayMemberAccount selectAdapayMemberAccountById(Long id) {
return adapayMemberAccountMapper.selectAdapayMemberAccountById(id);
}
/**
* 查询【请填写功能名称】列表
@@ -69,13 +59,14 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
/**
* 新增
*
* @param adapayMemberAccount
* @return 结果
*/
@Override
public int insertAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount) {
adapayMemberAccount.setCreateTime(DateUtils.getNowDate());
return adapayMemberAccountMapper.insertAdapayMemberAccount(adapayMemberAccount);
return adapayMemberAccountMapper.insertSelective(adapayMemberAccount);
}
/**
@@ -106,16 +97,7 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
return adapayMemberAccountMapper.deleteAdapayMemberAccountByIds(ids);
}
/**
* 删除【请填写功能名称】信息
*
* @param id 【请填写功能名称】主键
* @return 结果
*/
@Override
public int deleteAdapayMemberAccountById(Long id) {
return adapayMemberAccountMapper.deleteAdapayMemberAccountById(id);
}
@Override
public AdapayMemberAccount selectByMerchantId(String merchantId) {
@@ -139,24 +121,9 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
return adapayMemberAccountMapper.selectByMemberId(memberId);
}
@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) {
log.error("通过merchantId:{}, 没有查询到结算账户配置", pileStationInfo.getMerchantId());
return null;
}
return adapayMemberAccount.getAdapayMemberId();
}
@Override
public void deleteByMemberId(String memberId) {
adapayMemberAccountMapper.deleteByMemberId(memberId);
}
@Override
public void updateAdapayMemberAccountByMemberId(AdapayMemberAccount adapayMemberAccount) {
@@ -170,4 +137,51 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
account.setRemark(Constants.DEFAULT);
return account;
}
@Override
public int insert(AdapayMemberAccount record) {
return adapayMemberAccountMapper.insert(record);
}
@Override
public int insertOrUpdate(AdapayMemberAccount record) {
return adapayMemberAccountMapper.insertOrUpdate(record);
}
@Override
public int insertOrUpdateSelective(AdapayMemberAccount record) {
return adapayMemberAccountMapper.insertOrUpdateSelective(record);
}
@Override
public int insertSelective(AdapayMemberAccount record) {
return adapayMemberAccountMapper.insertSelective(record);
}
@Override
public AdapayMemberAccount selectByPrimaryKey(Integer id) {
return adapayMemberAccountMapper.selectByPrimaryKey(id);
}
@Override
public int updateByPrimaryKeySelective(AdapayMemberAccount record) {
return adapayMemberAccountMapper.updateByPrimaryKeySelective(record);
}
@Override
public int updateByPrimaryKey(AdapayMemberAccount record) {
return adapayMemberAccountMapper.updateByPrimaryKey(record);
}
@Override
public int updateBatch(List<AdapayMemberAccount> list) {
return adapayMemberAccountMapper.updateBatch(list);
}
@Override
public int batchInsert(List<AdapayMemberAccount> list) {
return adapayMemberAccountMapper.batchInsert(list);
}
}

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

@@ -153,7 +153,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
private ISettleOrderReportService settleOrderReportService;
@Autowired
private IAdapayMemberAccountService adapayMemberAccountService;
private AdapayMemberAccountService adapayMemberAccountService;
@Autowired
private PileRemoteService pileRemoteService;

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

@@ -76,7 +76,7 @@ public abstract class AbstractOrderLogic implements InitializingBean {
protected AdapayService adapayService;
@Autowired
protected IAdapayMemberAccountService adapayMemberAccountService;
protected AdapayMemberAccountService adapayMemberAccountService;
@Autowired
protected IPileMerchantInfoService pileMerchantInfoService;