|
@@ -138,6 +138,22 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
|
|
|
@Resource
|
|
@Resource
|
|
|
private ShopMoneyMapper shopMoneyMapper;
|
|
private ShopMoneyMapper shopMoneyMapper;
|
|
|
|
|
|
|
|
|
|
+ void assertDeviceEnrollmentSucceeded(JsonObject addUserJson, JsonObject addFaceJson) {
|
|
|
|
|
+ int addUserCode = getHikiotCode(addUserJson);
|
|
|
|
|
+ int addFaceCode = getHikiotCode(addFaceJson);
|
|
|
|
|
+ if (addUserCode != 0 || addFaceCode != 0) {
|
|
|
|
|
+ log.error("设备录入用户信息失败,addUser返回={},addFace返回={}", addUserJson, addFaceJson);
|
|
|
|
|
+ throw new JeecgBootException("设备录入用户信息失败!请联系管理员");
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ private int getHikiotCode(JsonObject result) {
|
|
|
|
|
+ if (result == null || !result.has("code") || result.get("code").isJsonNull()) {
|
|
|
|
|
+ return -1;
|
|
|
|
|
+ }
|
|
|
|
|
+ return result.get("code").getAsInt();
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public OrderVO.createOrderPlaceSchool createOrderPlaceSchool(String rulesId, String userIds) {
|
|
public OrderVO.createOrderPlaceSchool createOrderPlaceSchool(String rulesId, String userIds) {
|
|
@@ -1179,9 +1195,7 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
|
|
|
appDevice.getDeviceSerial(),
|
|
appDevice.getDeviceSerial(),
|
|
|
familyMembers.getId(),
|
|
familyMembers.getId(),
|
|
|
familyMembers.getRealNameImg())).getAsJsonObject();
|
|
familyMembers.getRealNameImg())).getAsJsonObject();
|
|
|
- if (addUserJson.get("code").getAsInt() != 0 && addFaceJson.get("code").getAsInt() != 0) {
|
|
|
|
|
- throw new JeecgBootException("设备录入用户信息失败!请联系管理员");
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ assertDeviceEnrollmentSucceeded(addUserJson, addFaceJson);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -1200,9 +1214,7 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
|
|
|
appDevice.getDeviceSerial(),
|
|
appDevice.getDeviceSerial(),
|
|
|
familyMembers.getId(),
|
|
familyMembers.getId(),
|
|
|
familyMembers.getRealNameImg())).getAsJsonObject();
|
|
familyMembers.getRealNameImg())).getAsJsonObject();
|
|
|
- if (addUserJson.get("code").getAsInt() != 0 && addFaceJson.get("code").getAsInt() != 0) {
|
|
|
|
|
- throw new JeecgBootException("设备录入用户信息失败!请联系管理员");
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ assertDeviceEnrollmentSucceeded(addUserJson, addFaceJson);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -1342,8 +1354,7 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
|
|
|
|
|
|
|
|
JsonObject addUserJson = JsonParser.parseString(addUser).getAsJsonObject();
|
|
JsonObject addUserJson = JsonParser.parseString(addUser).getAsJsonObject();
|
|
|
JsonObject addFaceJson = JsonParser.parseString(addFace).getAsJsonObject();
|
|
JsonObject addFaceJson = JsonParser.parseString(addFace).getAsJsonObject();
|
|
|
- if (addUserJson.get("code").getAsInt() != 0 && addFaceJson.get("code").getAsInt() != 0)
|
|
|
|
|
- throw new JeecgBootException("设备录入用户信息失败!请联系管理员");
|
|
|
|
|
|
|
+ assertDeviceEnrollmentSucceeded(addUserJson, addFaceJson);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|