mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-06-20 23:29:48 +08:00
update
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -91,6 +91,14 @@ public interface MemberBasicInfoService {
|
||||
*/
|
||||
MemberBasicInfo selectInfoByMemberId(String memberId);
|
||||
|
||||
/**
|
||||
* 判断指定会员id是否已经存在。
|
||||
*
|
||||
* @param memberId 会员id
|
||||
* @return true-已存在;false-不存在
|
||||
*/
|
||||
boolean existsByMemberId(String memberId);
|
||||
|
||||
String generateWalletCode();
|
||||
|
||||
/**
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
// 钱包编号
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user