Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user