czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

扫码pos机支付，改之前的部分bug

Browse Source
This commit is contained in:
lyf
2023-03-30 11:04:46 +08:00
parent 38d3ad79c8
commit 515dc85a8a
9 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/AliyunServiceImpl.java
View File

@@ -285,12 +285,16 @@ public class AliyunServiceImpl implements AliyunService {
if ("403".equals(verifyBankElementResponse.getBody().getCode())){
throw new MsgException("24小时内重复查询相同信息超过10次，已锁定，请在12小时后重试。");
}
if ("428".equals(verifyBankElementResponse.getBody().getCode())){
throw new MsgException("请正确输入相关信息");
}
if (!"200".equals(verifyBankElementResponse.getBody().getResultObject().getSubCode())) {
if ("403".equals(verifyBankElementResponse.getBody().getResultObject().getSubCode())) {
throw new MsgException("银行卡认证接口已欠费，请联系平台");
}else if ("201".equals(verifyBankElementResponse.getBody().getResultObject().getSubCode())){
throw new MsgException("用户的身份信息不匹配");
} else {
}else {
throw new MsgException("银行卡认证失败");
}
}

2
pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/DeviceStockService.java
View File

@@ -99,4 +99,6 @@ public interface DeviceStockService extends IService<DeviceStock> {
* @param dto
*/
void bindDevcieV2(DeviceStockDTO dto);
DeviceStock checkBind(String sn);
}

8
pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java
View File

@@ -391,6 +391,14 @@ public class DeviceStockServiceImpl extends ServiceImpl<DeviceStockMapper, Devic
deviceOperateInfoService.save(operateInfo);
}
@Override
public DeviceStock checkBind(String sn) {
MsgException.checkBlank(sn, "缺失设备SN号");
DeviceStock deviceBySnNo = baseMapper.getDeviceBySnNo(sn);
MsgException.checkBlank(deviceBySnNo.getActMercId(),"未绑定扫码pos");
return deviceBySnNo;
}
@Override
public <E extends IPage<DeviceStock>> E page(E page, Wrapper<DeviceStock> queryWrapper) {
DeviceStock deviceStock = queryWrapper.getEntity();

6
pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantBaseInfoService.java
View File

@@ -46,6 +46,12 @@ public interface MerchantBaseInfoService extends IService<MerchantBaseInfo> {
MerchantBaseInfo queryMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo);
/**根据id查找
* @param id
* @return
*/
MerchantBaseInfo getMerchantBaseInfoById(Integer id);
List<MerchantBaseInfo> queryMerchantBaseInfoList(MerchantBaseInfo merchantBaseInfo);
void saveMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo);

6
pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantBaseInfoServiceImpl.java
View File

@@ -438,6 +438,12 @@ public class MerchantBaseInfoServiceImpl extends ServiceImpl<MerchantBaseInfoMap
return baseMapper.queryMerchantBaseInfo(merchantBaseInfo);
}
@Override
public MerchantBaseInfo getMerchantBaseInfoById(Integer id) {
LambdaQueryWrapper<MerchantBaseInfo> qWrapper = new LambdaQueryWrapper<MerchantBaseInfo>().eq(MerchantBaseInfo::getId, id);
return baseMapper.selectOne(qWrapper);
}
@Override
public List<MerchantBaseInfo> queryMerchantBaseInfoList(MerchantBaseInfo merchantBaseInfo) {
return baseMapper.queryMerchantBaseInfoList(merchantBaseInfo);

2
pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantStaffConnServiceImpl.java
View File

@@ -83,7 +83,7 @@ public class MerchantStaffConnServiceImpl extends ServiceImpl<MerchantStaffConnM
if (loginName.contains("@")) {
throw new MsgException("员工账号请不要带@");
}
staffDTO.setLoginName(loginName + "@chaozg");
staffDTO.setLoginName(loginName + "@kuaiyin");
UserInfo existUserInfo = new UserInfo().setLoginName(staffDTO.getLoginName());
existUserInfo = userInfoService.getOne(new QueryWrapper<>(existUserInfo));
if (existUserInfo != null) {