Merge remote-tracking branch 'origin/master'

This commit is contained in:
韩鹏辉
2023-06-13 10:10:21 +08:00
8 changed files with 72 additions and 13 deletions

View File

@@ -101,6 +101,7 @@ public interface DeviceStockService extends IService<DeviceStock> {
void bindDevcieV2(DeviceStockDTO dto);
DeviceStock checkBind(String sn);
DeviceStock checkSN(String sn);
DeviceStock getDeviceBySnNo(String sn);
}

View File

@@ -398,6 +398,16 @@ public class DeviceStockServiceImpl extends ServiceImpl<DeviceStockMapper, Devic
MsgException.checkBlank(deviceBySnNo.getActMercId(),"未绑定扫码pos");
return deviceBySnNo;
}
@Override
public DeviceStock checkSN(String sn) {
MsgException.checkBlank(sn, "缺失设备SN号");
DeviceStock deviceBySnNo = baseMapper.getDeviceBySnNo(sn);
if (deviceBySnNo == null){
MsgException.throwException("未绑定扫码pos");
}
return deviceBySnNo;
}
@Override
public DeviceStock getDeviceBySnNo(String sn) {