Commit b891a6a3 authored by fanjr's avatar fanjr

修改

parent 77f3700c
...@@ -45,18 +45,29 @@ public class PdaCouponrecordServiceImpl implements PdaCouponrecordService { ...@@ -45,18 +45,29 @@ public class PdaCouponrecordServiceImpl implements PdaCouponrecordService {
Couponrecord info = couponrecordMapper.isWriteOff(number); Couponrecord info = couponrecordMapper.isWriteOff(number);
if(info!=null){ if(info!=null){
if(info.getStatus().equals("1")){ if(info.getStatus().equals("1")){
long hospitalId = couponrecordMapper.getHospitalIdByfaNo(facilityNo); Map<String,Object> map1= couponrecordMapper.getHospitalIdByfaNo(facilityNo);
info.setStatus("2"); if(map1!=null&&map1.size()>0){
info.setVerifDate(new Date()); long hospitalId = Long.valueOf(map1.get("id")+"");
info.setFacilityNo(facilityNo); info.setStatus("2");
info.setHospitalId(hospitalId); info.setVerifDate(new Date());
couponrecordMapper.update(info); info.setFacilityNo(facilityNo);
rtnJson.put("code", 200); info.setHospitalId(hospitalId);
rtnJson.put("msg", "验证成功!"); couponrecordMapper.update(info);
map = new HashMap<String,Object>(); rtnJson.put("code", 200);
map.put("id",logId); rtnJson.put("msg", "验证成功!");
map.put("resultJson",rtnJson.toString()); map = new HashMap<String,Object>();
map.put("status",2); map.put("id",logId);
map.put("resultJson",rtnJson.toString());
map.put("status",2);
}else{
rtnJson.put("code", 500);
rtnJson.put("msg", "未找到设备号对应的医院!");
map = new HashMap<String,Object>();
map.put("id",logId);
map.put("resultJson",rtnJson.toString());
map.put("status",1);
couponrecordMapper.updatePdaLog(map);
}
}else if(info.getStatus().equals("0")){ }else if(info.getStatus().equals("0")){
rtnJson.put("code", 500); rtnJson.put("code", 500);
rtnJson.put("msg", "检测券未激活!"); rtnJson.put("msg", "检测券未激活!");
...@@ -65,7 +76,7 @@ public class PdaCouponrecordServiceImpl implements PdaCouponrecordService { ...@@ -65,7 +76,7 @@ public class PdaCouponrecordServiceImpl implements PdaCouponrecordService {
map.put("resultJson",rtnJson.toString()); map.put("resultJson",rtnJson.toString());
map.put("status",1); map.put("status",1);
}else if(info.getStatus().equals("2")){ }else if(info.getStatus().equals("2")){
rtnJson.put("code", 500); rtnJson.put("code", 201);
rtnJson.put("msg", "检测券已使用!"); rtnJson.put("msg", "检测券已使用!");
map = new HashMap<String,Object>(); map = new HashMap<String,Object>();
map.put("id",logId); map.put("id",logId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment